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

Samuel Mehrbrodt Samuel.Mehrbrodt at cib.de
Fri May 6 09:15:43 UTC 2016


 sc/source/ui/app/inputwin.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 23f86273068b2389fc8703a8cc6b5c77968c918d
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Fri May 6 08:20:21 2016 +0200

    tdf#99701 Calc multiline input: Give button a fixed width
    
    It should not depend on the scrollbar size as the scrollbar
    is very thin in some environments (esp. GTK3)
    
    Change-Id: I5cb4b145c21614482d7d402cebc33600f29cce09
    Reviewed-on: https://gerrit.libreoffice.org/24688
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 1e9a102..962a84c 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -72,6 +72,7 @@
 
 #define THESIZE             1000000 // Should be more than enough!
 #define TBX_WINDOW_HEIGHT   22 // in pixel - TODO: The same on all systems?
+#define MULTILINE_BUTTON_WIDTH 20 // Width of the button which opens the multiline dropdown
 #define LEFT_OFFSET         5
 #define INPUTWIN_MULTILINES 6
 const long BUTTON_OFFSET = 2; ///< space between input line and the button to expand / collapse
@@ -882,7 +883,7 @@ ScInputBarGroup::ScInputBarGroup(vcl::Window* pParent, ScTabViewShell* pViewSh)
     maTextWnd->SetQuickHelpText(ScResId(SCSTR_QHELP_INPUTWND));
     maTextWnd->SetHelpId(HID_INSWIN_INPUT);
 
-    Size aSize(GetSettings().GetStyleSettings().GetScrollBarSize(), maTextWnd->GetPixelHeightForLines(1));
+    Size aSize(MULTILINE_BUTTON_WIDTH, maTextWnd->GetPixelHeightForLines(1));
 
     maButton->SetClickHdl(LINK(this, ScInputBarGroup, ClickHdl));
     maButton->SetSizePixel(aSize);


More information about the Libreoffice-commits mailing list