[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-3' - vcl/source

[Keith Curtis]

 vcl/source/window/toolbox.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b740953537b324e157b22ce3bd46611b01f78e47
Author: Keith Curtis <keithcu at gmail.com>
Date:   Mon Mar 17 20:16:57 2014 -0400

    Hopefully fix Windows HiDPI toolbar layout bug
    
    On Windows HiDPI, toolbar buttons are cut off. This may fix the problem.
    
    Here is a screenshot:
    http://i.imgur.com/NADAvYi.png
    
    I can't prove this fixes anything on Windows because I can't see this
    on Linux and don't really understand the surrounding code. On the other
    hand, it is easy to prove this is reasonable code.
    
    Change-Id: I69c19ad46844bead942ce63883d163cb9d0690c9
    Reviewed-on: https://gerrit.libreoffice.org/8637
    Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 509441038ab95dd3a60efd1b6c302bf22bfbc631)
    Reviewed-on: https://gerrit.libreoffice.org/8749
    Reviewed-by: Keith Curtis <keithcu at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 0d7bf8a..4613879 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1747,8 +1747,8 @@ sal_Bool ToolBox::ImplCalcItem()
     long            nDropDownArrowWidth = TB_DROPDOWNARROWWIDTH;
 
     // set defaults if image or text is needed but empty
-    nDefWidth       = GetDefaultImageSize().Width();
-    nDefHeight      = GetDefaultImageSize().Height();
+    nDefWidth       = GetDefaultImageSize().Width() * GetDPIScaleFactor();
+    nDefHeight      = GetDefaultImageSize().Height() * GetDPIScaleFactor();
 
     mnWinHeight = 0;
     // determine minimum size necessary in NWF