diff options
-rw-r--r-- | vcl/source/window/window.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index f1cab6645536..f477b5c02c7f 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -983,7 +983,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 = maSettings.GetStyleSettings(); sal_uInt16 nScreenZoom = rStyleSettings.GetScreenZoom(); @@ -1723,7 +1727,11 @@ void Window::ImplInitResolutionSettings() mnDPIY = (mpWindowImpl->mpFrameData->mnDPIY*nScreenZoom)/100; // setup the scale factor for Hi-DPI displays - mnDPIScaleFactor = std::max(1, (mpWindowImpl->mpFrameData->mnDPIY + 48) / 96); +#ifdef MACOSX + mnDPIScaleFactor = 1; +#else + mnDPIScaleFactor = std::max((sal_Int32)1, (mpWindowImpl->mpFrameData->mnDPIY + 48) / 96); +#endif SetPointFont( rStyleSettings.GetAppFont() ); } |