summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2016-11-13 22:54:58 +0200
committerKhaled Hosny <khaledhosny@eglug.org>2016-11-14 16:21:37 +0200
commitea95ced269dceb72681f0e4a21d87499153d5781 (patch)
tree0b48803ff265a677af69d342f94c4bb6f40236af /vcl/source
parent6e32e575829160b3c51ebbb67231baec7135afd3 (diff)
Revert "tdf#103725: Fix horizontal scaling on Windows"
This reverts commit 30fefcf71417f8c8644f5c0d3cb28c8c7f92a6c7. Thuough it works on my system, others report that it made things worse. A better fix is comming, hopefully.
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/gdi/CommonSalLayout.cxx6
1 files changed, 0 insertions, 6 deletions
diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index a6536f1bfb77..1031b9c17dc8 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -95,13 +95,7 @@ void CommonSalLayout::getScale(double* nXScale, double* nYScale)
unsigned int nUPEM = hb_face_get_upem(pHbFace);
double nHeight(mrFontSelData.mnHeight);
-#if defined(_WIN32)
- // FIXME: we get very weird font width on Windows, the number below is
- // “reverse engineered” so that I get the width I’m expecting.
- double nWidth(mrFontSelData.mnWidth ? mrFontSelData.mnWidth * 1.8285 : nHeight);
-#else
double nWidth(mrFontSelData.mnWidth ? mrFontSelData.mnWidth : nHeight);
-#endif
if (nYScale)
*nYScale = nHeight / nUPEM;