callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

image: background and border should be drawn around the widget

Browse Source 
... not around the contents. If you want the widget to not be larger
than the contents, don't use ALIGN_FILL.
This commit is contained in:
Benjamin Otte
2012-06-14 20:06:39 +02:00
parent c187386fe1
commit d40c496e6e
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkimage.c
View File

@ -1384,6 +1384,13 @@ gtk_image_draw (GtkWidget *widget,
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
gtk_render_background (context, cr,
0, 0,
gtk_widget_get_allocated_width (widget), gtk_widget_get_allocated_height (widget));
gtk_render_frame (context, cr,
0, 0,
gtk_widget_get_allocated_width (widget), gtk_widget_get_allocated_height (widget));
gtk_misc_get_alignment (misc, &xalign, &yalign); gtk_misc_get_alignment (misc, &xalign, &yalign);
gtk_image_get_preferred_size (image, &width, &height); gtk_image_get_preferred_size (image, &width, &height);
_gtk_misc_get_padding_and_border (misc, &border); _gtk_misc_get_padding_and_border (misc, &border);
@ -1391,11 +1398,8 @@ gtk_image_draw (GtkWidget *widget,
if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR) if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR)
xalign = 1.0 - xalign; xalign = 1.0 - xalign;
x = floor ((gtk_widget_get_allocated_width (widget) - width) * xalign); x = floor ((gtk_widget_get_allocated_width (widget) - width) * xalign) + border.left;
y = floor ((gtk_widget_get_allocated_height (widget) - height) * yalign); y = floor ((gtk_widget_get_allocated_height (widget) - height) * yalign) + border.top;
gtk_render_background (context, cr, x, y, width, height);
gtk_render_frame (context, cr, x, y, width, height);
x += border.left; x += border.left;
y += border.top; y += border.top;