diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-17 15:31:38 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-17 15:32:04 +0000 |
| commit | 7f1af0a1c7401552704eaba2091b078890567cd8 (patch) | |
| tree | 6fb2e6d4d241f86645928825836d767373a19ed1 /vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | |
| parent | 4579c43861635dda15158478404aa90151228e91 (diff) | |
put the render frame at the end of these blocks too
Change-Id: I72270faa4138377ea04467ad0c6f01a3de0156b6
Diffstat (limited to 'vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx')
| -rw-r--r-- | vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx index 4a957bb5ab8c..f3edc2bc6a0c 100644 --- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx @@ -685,9 +685,6 @@ void GtkSalGraphics::PaintOneSpinButton( GtkStyleContext *context, gtk_render_background(context, cr, buttonRect.Left(), buttonRect.Top(), buttonRect.GetWidth(), buttonRect.GetHeight() ); - gtk_render_frame(context, cr, - buttonRect.Left(), buttonRect.Top(), - buttonRect.GetWidth(), buttonRect.GetHeight() ); gint iconWidth = (buttonRect.GetWidth() - padding.left - padding.right - border.left - border.right); gint iconHeight = (buttonRect.GetHeight() - padding.top - padding.bottom - border.top - border.bottom); @@ -710,6 +707,10 @@ void GtkSalGraphics::PaintOneSpinButton( GtkStyleContext *context, gtk_render_icon(context, cr, pixbuf, arrowRect.Left(), arrowRect.Top()); g_object_unref(pixbuf); + + gtk_render_frame(context, cr, + buttonRect.Left(), buttonRect.Top(), + buttonRect.GetWidth(), buttonRect.GetHeight() ); } void GtkSalGraphics::PaintSpinButton(GtkStateFlags flags, @@ -1758,12 +1759,13 @@ void GtkSalGraphics::PaintCheckOrRadio(cairo_t *cr, GtkStyleContext *context, if (!bInMenu) gtk_render_background(context, cr, x, y, indicator_size, indicator_size); - gtk_render_frame(context, cr, x, y, indicator_size, indicator_size); if (bIsCheck) gtk_render_check(context, cr, x, y, indicator_size, indicator_size); else gtk_render_option(context, cr, x, y, indicator_size, indicator_size); + + gtk_render_frame(context, cr, x, y, indicator_size, indicator_size); } void GtkSalGraphics::PaintCheck(cairo_t *cr, GtkStyleContext *context, @@ -2142,7 +2144,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co case RenderType::Progress: { gtk_render_background(mpProgressBarTroughStyle, cr, nX, nY, nWidth, nHeight); - gtk_render_frame(mpProgressBarTroughStyle, cr, nX, nY, nWidth, nHeight); + long nProgressWidth = rValue.getNumericVal(); if (nProgressWidth) { @@ -2157,6 +2159,8 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co gtk_render_frame(context, cr, nX, nY, nProgressWidth, nHeight); } + gtk_render_frame(mpProgressBarTroughStyle, cr, nX, nY, nWidth, nHeight); + break; } case RenderType::TabItem: |