[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/unx
Caolán McNamara
caolanm at redhat.com
Fri Jun 19 04:34:33 PDT 2015
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
New commits:
commit ae74c58f8e299e3e0ccb6076280cbbb1d7aba8b1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jun 19 12:33:54 2015 +0100
gtk3: get right bounds for scrollbar thumb with no arrow buttons
Change-Id: Ie96ccd3b3b0e2bebf10496f91d110d9a1a62e133
(cherry picked from commit a17b73acbe96049259979413eafe71159d2e1204)
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 7c3a1d5..f9d41ef 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1299,11 +1299,15 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
((nPart==PART_BUTTON_LEFT) || (nPart==PART_BUTTON_RIGHT) ||
(nPart==PART_BUTTON_UP) || (nPart==PART_BUTTON_DOWN) ) )
{
- aEditRect = NWGetScrollButtonRect( nPart, rControlRegion );
- if (!aEditRect.GetWidth())
- aEditRect.Right() = aEditRect.Left() + 1;
- if (!aEditRect.GetHeight())
- aEditRect.Bottom() = aEditRect.Top() + 1;
+ rNativeBoundingRegion = NWGetScrollButtonRect( nPart, rControlRegion );
+ rNativeContentRegion = rNativeBoundingRegion;
+
+ if (!rNativeContentRegion.GetWidth())
+ rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1;
+ if (!rNativeContentRegion.GetHeight())
+ rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1;
+
+ return true;
}
if( (nType == CTRL_MENUBAR) && (nPart == PART_ENTIRE_CONTROL) )
{
More information about the Libreoffice-commits
mailing list