summaryrefslogtreecommitdiff
path: root/gtk/gtkimage.c
diff options
context:
space:
mode:
authorTimm Bäder <mail@baedert.org>2017-12-04 12:14:21 +0100
committerTimm Bäder <mail@baedert.org>2017-12-04 12:24:18 +0100
commit3a3783dfcde9f64155b44f2cfb1e5adbab1a0f80 (patch)
treeba390dffbb21fc5d3e98f4d71abfe01ff03b609f /gtk/gtkimage.c
parentdbc4796d6af6bbff520a36aa5800cead955b1991 (diff)
downloadgtk+-3a3783dfcde9f64155b44f2cfb1e5adbab1a0f80.tar.gz
image: Stop using gtk_widget_get_content_size
Diffstat (limited to 'gtk/gtkimage.c')
-rw-r--r--gtk/gtkimage.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 81710fa73b..629319772b 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1199,11 +1199,12 @@ gtk_image_snapshot (GtkWidget *widget,
int x, y, width, height;
gint w, h, baseline;
- gtk_widget_get_content_size (widget, &width, &height);
- x = 0;
+ width = gtk_widget_get_width (widget);
+ height = gtk_widget_get_height (widget);
y = 0;
_gtk_icon_helper_get_size (&priv->icon_helper, &w, &h);
+ x = (width - w) / 2;
baseline = gtk_widget_get_allocated_baseline (widget);
@@ -1212,8 +1213,6 @@ gtk_image_snapshot (GtkWidget *widget,
else
y += CLAMP (baseline - h * gtk_image_get_baseline_align (image), 0, height - h);
- x += (width - w) / 2;
-
gtk_snapshot_offset (snapshot, x, y);
gtk_icon_helper_snapshot (&priv->icon_helper, snapshot);
gtk_snapshot_offset (snapshot, -x, -y);