Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

image: add gtk_image_get_preferred_size()

Browse Source 
Add a function to query the preferred size of the GtkImage, and use it
in the get_preferred_width/height implementations.
This commit is contained in:
Cosimo Cecchi
2011-12-12 12:29:21 +01:00
parent 92929b968b
commit b215aeacc8
1 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
gtk/gtkimage.c
View File

@@ -1256,6 +1256,28 @@ get_animation_frame (GtkImage *image)
return g_object_ref (gdk_pixbuf_animation_iter_get_pixbuf (priv->animation_iter)); return g_object_ref (gdk_pixbuf_animation_iter_get_pixbuf (priv->animation_iter));
} }
static void
gtk_image_get_preferred_size (GtkImage *image,
gint *width_out,
gint *height_out)
{
GtkImagePrivate *priv = image->priv;
gint xpad, ypad, width, height;
GtkStyleContext *context;
context = gtk_widget_get_style_context (GTK_WIDGET (image));
gtk_misc_get_padding (GTK_MISC (image), &xpad, &ypad);
_gtk_icon_helper_get_size (priv->icon_helper, context, &width, &height);
width += 2 * xpad;
height += 2 * ypad;
if (width_out)
*width_out = width;
if (height_out)
*height_out = height;
}
static gint static gint
gtk_image_draw (GtkWidget *widget, gtk_image_draw (GtkWidget *widget,
cairo_t *cr) cairo_t *cr)
@@ -1385,33 +1407,21 @@ gtk_image_get_preferred_width (GtkWidget *widget,
gint *minimum, gint *minimum,
gint *natural) gint *natural)
{ {
GtkImage *image = GTK_IMAGE (widget); gint width;
GtkImagePrivate *priv = image->priv;
gint xpad, width;
GtkStyleContext *context;
context = gtk_widget_get_style_context (widget); gtk_image_get_preferred_size (GTK_IMAGE (widget), &width, NULL);
gtk_misc_get_padding (GTK_MISC (image), &xpad, NULL); *minimum = *natural = width;
_gtk_icon_helper_get_size (priv->icon_helper, context, &width, NULL); }
*minimum = *natural = width + 2 * xpad;
}
static void static void
gtk_image_get_preferred_height (GtkWidget *widget, gtk_image_get_preferred_height (GtkWidget *widget,
gint *minimum, gint *minimum,
gint *natural) gint *natural)
{ {
GtkImage *image = GTK_IMAGE (widget); gint height;
GtkImagePrivate *priv = image->priv;
gint ypad, height;
GtkStyleContext *context;
context = gtk_widget_get_style_context (widget); gtk_image_get_preferred_size (GTK_IMAGE (widget), NULL, &height);
gtk_misc_get_padding (GTK_MISC (image), NULL, &ypad); *minimum = *natural = height;
_gtk_icon_helper_get_size (priv->icon_helper, context, NULL, &height);
*minimum = *natural = height + 2 * ypad;
} }
static void static void