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

[Libreoffice Gerrit user]

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

New commits:
commit 59647fa4d190622cc6aae873de06a4dfe973bd54
Author:     Xisco Faulí <xiscofauli at libreoffice.org>
AuthorDate: Thu Jan 17 12:00:59 2019 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Thu Jan 17 15:19:41 2019 +0100

    tdf#122761: Revert "Resolves tdf#122118 - Toolbar dropdown button triangles are too large"
    
    This reverts commit b56ad2a1292b01647c4ee1f4364f7c4aa20fc449.
    
    Change-Id: I0fa94c4a027a85a14e85c53a18443d97fa862a59
    Reviewed-on: https://gerrit.libreoffice.org/66507
    Reviewed-by: Heiko Tietze <tietze.heiko at gmail.com>
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 9533784c0dab..4d203c6b9186 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2492,12 +2492,9 @@ static void ImplDrawDropdownArrow(vcl::RenderContext& rRenderContext, const tool
     float fScaleFactor = rRenderContext.GetDPIScaleFactor();
 
     tools::Polygon aPoly(4);
-    int iTBHeight = rRenderContext.GetOutputSize().Height(); //scale triangle depending on theme/toolbar height
 
-    long width = round(iTBHeight/5.5) * fScaleFactor; // 7 for gtk, 5 for gen
-    long height = round(iTBHeight/9.5) * fScaleFactor; // 4 for gtk, 3 for gen
-    if (width < 4) width = 4;
-    if (height < 3) height = 3;
+    long width = 7 * fScaleFactor;
+    long height = 4 * fScaleFactor;
 
     long x = rDropDownRect.Left() + (rDropDownRect.getWidth() - width)/2;
     long y = rDropDownRect.Top() + (rDropDownRect.getHeight() - height)/2;