diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-08-25 14:14:58 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-08-25 14:31:20 +0400 |
| commit | a2c5a1174ef964f3993f49162b4d8d14b8f02c46 (patch) | |
| tree | 2bc0aa13c18d359fb0a5cd3fe9e43fc11966a2a2 /vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | |
| parent | 5e7249f9958aeb0407e8502b500d6865e5af8750 (diff) | |
gtk: fix scrollbar drawing with Clearlooks
Change-Id: Ia1afbfd027bf473f23b83239562f542d0157d549
Diffstat (limited to 'vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx')
| -rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index a0ccfb6a509f..f204c03beaba 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -1751,8 +1751,6 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, // Find the overall bounding rect of the control pixmapRect = rControlRectangle; - pixmapRect.SetSize( Size( pixmapRect.GetWidth() + 1, - pixmapRect.GetHeight() + 1 ) ); scrollbarRect = pixmapRect; if ( (scrollbarRect.GetWidth() <= 1) || (scrollbarRect.GetHeight() <= 1) ) @@ -1939,13 +1937,22 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, x+hShim+thumbRect.Left(), y+vShim+thumbRect.Top(), thumbRect.GetWidth(), thumbRect.GetHeight(), scrollbarOrientation ); } + + // Some engines require allocation, e.g. Clearlooks uses it to identify + // positions of the buttons, whereupon the first and the last button will + // have rounded corners. + GTK_WIDGET(scrollbarWidget)->allocation.x = x; + GTK_WIDGET(scrollbarWidget)->allocation.y = y; + GTK_WIDGET(scrollbarWidget)->allocation.width = w; + GTK_WIDGET(scrollbarWidget)->allocation.height = h; + // ----------------- BUTTON 1 // if ( has_backward ) { NWConvertVCLStateToGTKState( pScrollbarVal->mnButton1State, &stateType, &shadowType ); if ( stateType == GTK_STATE_INSENSITIVE ) stateType = GTK_STATE_NORMAL; gtk_paint_box( style, gdkDrawable, stateType, shadowType, - gdkRect, GTK_WIDGET(scrollbarWidget), "stepper", + gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, x+hShim+button11BoundRect.Left(), y+vShim+button11BoundRect.Top(), button11BoundRect.GetWidth(), button11BoundRect.GetHeight() ); // ----------------- ARROW 1 @@ -1960,7 +1967,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, NWConvertVCLStateToGTKState( pScrollbarVal->mnButton2State, &stateType, &shadowType ); if ( stateType == GTK_STATE_INSENSITIVE ) stateType = GTK_STATE_NORMAL; gtk_paint_box( style, gdkDrawable, stateType, shadowType, - gdkRect, GTK_WIDGET(scrollbarWidget), "stepper", + gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, x+hShim+button12BoundRect.Left(), y+vShim+button12BoundRect.Top(), button12BoundRect.GetWidth(), button12BoundRect.GetHeight() ); // ----------------- ARROW 1 @@ -1976,7 +1983,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, NWConvertVCLStateToGTKState( pScrollbarVal->mnButton1State, &stateType, &shadowType ); if ( stateType == GTK_STATE_INSENSITIVE ) stateType = GTK_STATE_NORMAL; gtk_paint_box( style, gdkDrawable, stateType, shadowType, gdkRect, - GTK_WIDGET(scrollbarWidget), "stepper", + GTK_WIDGET(scrollbarWidget), scrollbarTag, x+hShim+button21BoundRect.Left(), y+vShim+button21BoundRect.Top(), button21BoundRect.GetWidth(), button21BoundRect.GetHeight() ); // ----------------- ARROW 2 @@ -1991,7 +1998,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, NWConvertVCLStateToGTKState( pScrollbarVal->mnButton2State, &stateType, &shadowType ); if ( stateType == GTK_STATE_INSENSITIVE ) stateType = GTK_STATE_NORMAL; gtk_paint_box( style, gdkDrawable, stateType, shadowType, gdkRect, - GTK_WIDGET(scrollbarWidget), "stepper", + GTK_WIDGET(scrollbarWidget), scrollbarTag, x+hShim+button22BoundRect.Left(), y+vShim+button22BoundRect.Top(), button22BoundRect.GetWidth(), button22BoundRect.GetHeight() ); // ----------------- ARROW 2 |