[Libreoffice-commits] .: vcl/unx

[Caolán McNamara]

 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 54de1b7e7bc0a1028cf722920347b1bd5d09d3fc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 26 16:08:02 2011 +0000

    Resolves: fdo#33523 fix scrollbars in themes that have no up/down buttons

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 39e6627..2f9575f 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1055,6 +1055,12 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
         rNativeBoundingRegion = NWGetScrollButtonRect( m_nScreen, nPart, rControlRegion );
         rNativeContentRegion = rNativeBoundingRegion;
 
+        //See fdo#33523, possibly makes sense to do this test for all return values
+        if (!rNativeContentRegion.GetWidth())
+            rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1;
+        if (!rNativeContentRegion.GetHeight())
+            rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1;
+
         returnVal = TRUE;
     }
     if( (nType == CTRL_MENUBAR) && (nPart == PART_ENTIRE_CONTROL) )
@@ -1622,6 +1628,10 @@ BOOL GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
     NWSetWidgetState( gWidgetData[m_nScreen].gBtnWidget, nState, stateType );
     style = GTK_WIDGET( scrollbarWidget )->style;
 
+    gtk_style_apply_default_background( m_pWindow->style, gdkDrawable, TRUE,
+                                        GTK_STATE_NORMAL, gdkRect,
+                                        x, y, w, h );
+
     // ----------------- TROUGH
     gtk_paint_flat_box( m_pWindow->style, gdkDrawable,
                         GTK_STATE_NORMAL, GTK_SHADOW_NONE, gdkRect,