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

[Libreoffice Gerrit user]

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

New commits:
commit e3cc5506d695b602fbd3c6ee816e36e6a76d9d96
Author:     heiko tietze <tietze.heiko at gmail.com>
AuthorDate: Fri Jan 18 09:03:57 2019 +0100
Commit:     Heiko Tietze <tietze.heiko at gmail.com>
CommitDate: Fri Jan 18 17:56:49 2019 +0100

    Resolves tdf#122118 - Toolbar dropdown button triangles are too large
    
    Toolbar expander triangles are now scaled depending on the parent size
    
    Change-Id: I4974c0976c1591fc09594bf4aeca020a72ebf11a
    Reviewed-on: https://gerrit.libreoffice.org/66565
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <tietze.heiko at gmail.com>
    Tested-by: Heiko Tietze <tietze.heiko at gmail.com>

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 4d203c6b9186..90bd2622ef87 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2493,8 +2493,10 @@ static void ImplDrawDropdownArrow(vcl::RenderContext& rRenderContext, const tool
 
     tools::Polygon aPoly(4);
 
-    long width = 7 * fScaleFactor;
-    long height = 4 * fScaleFactor;
+    long width = round(rDropDownRect.getHeight()/5.5) * fScaleFactor; // scale triangle depending on theme/toolbar height with 7 for gtk, 5 for gen
+    long height = round(rDropDownRect.getHeight()/9.5) * fScaleFactor; // 4 for gtk, 3 for gen
+    if (width < 4) width = 4;
+    if (height < 3) height = 3;
 
     long x = rDropDownRect.Left() + (rDropDownRect.getWidth() - width)/2;
     long y = rDropDownRect.Top() + (rDropDownRect.getHeight() - height)/2;