[Libreoffice-commits] core.git: vcl/source

Jan Holesovsky kendy at collabora.com
Tue Jan 28 08:59:28 PST 2014


 vcl/source/window/window.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit ba9b0e9c1a48c612386be6e1acf6e39275ab30c6
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Jan 28 17:06:40 2014 +0100

    hidpi: Set the mnDPIScale during initialization too, of course.
    
    Change-Id: I71b4607d08c7f764670903c5c8e66f451fe2eb57

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index d29df4e..60ae11c 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -977,6 +977,9 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste
 
     }
 
+    // setup the scale factor for Hi-DPI displays
+    mnDPIScaleFactor = std::max((sal_Int32)1, (mpWindowImpl->mpFrameData->mnDPIY + 48) / 96);
+
     const StyleSettings& rStyleSettings = maSettings.GetStyleSettings();
     sal_uInt16 nScreenZoom = rStyleSettings.GetScreenZoom();
     mnDPIX          = (mpWindowImpl->mpFrameData->mnDPIX*nScreenZoom)/100;


More information about the Libreoffice-commits mailing list