diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-03-11 15:42:49 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-03-12 13:05:23 -0500 |
| commit | ce5c798868e33c094971d8b8c2c9f40afc8f21c3 (patch) | |
| tree | d5c92e3f86ff209f2706e91243f4e7af40336f03 /vcl | |
| parent | a644b400d611bfa086e0cdb6b0a41228809ffd3d (diff) | |
force DPIScaleFactor to 1 on Mac
Conflicts:
vcl/source/window/window.cxx
Change-Id: I37629e1ef18f9843fcbdd643d8aaee0b3c8baa73
Reviewed-on: https://gerrit.libreoffice.org/8560
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'vcl')
| -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() ); } |