summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2014-03-11 15:42:49 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2014-03-11 15:44:25 -0500
commit4dbb04e5701efe084fbfd3f06128dd33a7d8965b (patch)
tree11742c18ac7b35e4edc55e3ccf49bf432aaa4ed8
parentc971c1fa66570bc6cbf658aa5c9cee15fc470bd2 (diff)
force DPIScaleFactor to 1 on Mac
Change-Id: I37629e1ef18f9843fcbdd643d8aaee0b3c8baa73
-rw-r--r--vcl/source/window/window.cxx10
1 files changed, 8 insertions, 2 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 54a6835e43b7..d4a0087740f7 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1067,8 +1067,11 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste
}
// setup the scale factor for Hi-DPI displays
+#ifdef MACOSX
+ mnDPIScaleFactor = 1;
+#else
mnDPIScaleFactor = std::max((sal_Int32)1, (mpWindowImpl->mpFrameData->mnDPIY + 48) / 96);
-
+#endif
const StyleSettings& rStyleSettings = mxSettings->GetStyleSettings();
sal_uInt16 nScreenZoom = rStyleSettings.GetScreenZoom();
mnDPIX = (mpWindowImpl->mpFrameData->mnDPIX*nScreenZoom)/100;
@@ -1812,8 +1815,11 @@ void Window::ImplInitResolutionSettings()
mnDPIY = (mpWindowImpl->mpFrameData->mnDPIY*nScreenZoom)/100;
// setup the scale factor for Hi-DPI displays
+#ifdef MACOSX
+ mnDPIScaleFactor = 1;
+#else
mnDPIScaleFactor = std::max((sal_Int32)1, (mpWindowImpl->mpFrameData->mnDPIY + 48) / 96);
-
+#endif
SetPointFont( rStyleSettings.GetAppFont() );
}
else if ( mpWindowImpl->mpParent )