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

image: Compute clip properly

Browse Source 
Use the helper function we have for this, don't do it manually. This has
the side effect of also supporting icon transforms.
This commit is contained in:
Benjamin Otte
2015-01-20 06:25:01 +01:00
parent f7433557ab
commit 22967f1612
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkimage.c
View File

@ -1532,7 +1532,6 @@ static void
gtk_image_size_allocate (GtkWidget *widget, gtk_image_size_allocate (GtkWidget *widget,
GtkAllocation *allocation) GtkAllocation *allocation)
{ {
GtkBorder extents;
GtkAllocation clip; GtkAllocation clip;
GTK_WIDGET_CLASS (gtk_image_parent_class)->size_allocate (widget, allocation); GTK_WIDGET_CLASS (gtk_image_parent_class)->size_allocate (widget, allocation);
@ -1540,11 +1539,13 @@ gtk_image_size_allocate (GtkWidget *widget,
/* XXX: This is not strictly correct, we could compute the area /* XXX: This is not strictly correct, we could compute the area
* actually occupied by the image, but I'm lazy... * actually occupied by the image, but I'm lazy...
*/ */
_gtk_css_shadows_value_get_extents (_gtk_style_context_peek_property (gtk_widget_get_style_context (widget), GTK_CSS_PROPERTY_ICON_SHADOW), &extents); _gtk_style_context_get_icon_extents (gtk_widget_get_style_context (widget),
clip.x = allocation->x - extents.left; &clip,
clip.width = allocation->width + extents.left + extents.right; allocation->x,
clip.y = allocation->y - extents.top; allocation->y,
clip.height = allocation->height + extents.top + extents.bottom; allocation->width,
allocation->height);
_gtk_widget_set_simple_clip (widget, &clip); _gtk_widget_set_simple_clip (widget, &clip);
} }