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

[Jan-Marek Glogowski (via logerrit)]

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

New commits:
commit 9921be1f47943781c443927f7c7d94a460f2780b
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Tue Jun 30 16:42:35 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Jul 8 02:31:11 2020 +0200

    tdf#130991 Scale the drop-down arrow size-request
    
    When requesting the size of the drop-down arrow button, the arrow
    rect must be scaled, like all other native size requests.
    
    Change-Id: Ic0ccd96e812527c880868d385484655526ebb09b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97536
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit ba956e60a868e98d22bc95efd041f423987e7f76)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97576
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    (cherry picked from commit f0daeb39aa61cc3435630cf0b9727f6da818de1a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97679
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index df5aadf89243..187ea2512f98 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1352,20 +1352,22 @@ static void ImplAddButtonBorder( long &rWidth, long& rHeight, bool bNativeButton
 
 bool ToolBox::ImplCalcItem()
 {
-
     // recalc required ?
     if ( !mbCalc )
         return false;
 
     ImplDisableFlatButtons();
 
+    OutputDevice *pDefault = Application::GetDefaultDevice();
+    float fScaleFactor = pDefault ? pDefault->GetDPIScaleFactor() : 1.0;
+
     long            nDefWidth;
     long            nDefHeight;
     long            nMaxWidth = 0;
     long            nMaxHeight = 0;
     long            nMinWidth   = 6;
     long            nMinHeight  = 6;
-    long            nDropDownArrowWidth = TB_DROPDOWNARROWWIDTH;
+    long            nDropDownArrowWidth = TB_DROPDOWNARROWWIDTH * fScaleFactor;
 #ifdef IOS
     nDropDownArrowWidth *= 3;
 #endif