AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

iconhelper: Move size computation

Browse Source 
We do a switch on the image type, so compute the size for a certain
image type right there.
This commit is contained in:
Benjamin Otte 2015-11-27 18:05:36 +01:00
parent a81bdf1e60
commit 071d2a1d69
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkiconhelper.c
View File

@ -867,6 +867,14 @@ _gtk_icon_helper_get_size (GtkIconHelper *self,
height = (height + scale - 1) / scale; height = (height + scale - 1) / scale;
break; break;
case GTK_IMAGE_ANIMATION:
{
GdkPixbufAnimation *animation = gtk_image_definition_get_animation (self->priv->def);
width = gdk_pixbuf_animation_get_width (animation);
height = gdk_pixbuf_animation_get_height (animation);
break;
}
case GTK_IMAGE_ICON_NAME: case GTK_IMAGE_ICON_NAME:
case GTK_IMAGE_GICON: case GTK_IMAGE_GICON:
if (self->priv->pixel_size != -1 || self->priv->force_scale_pixbuf) if (self->priv->pixel_size != -1 || self->priv->force_scale_pixbuf)
@ -876,7 +884,6 @@ _gtk_icon_helper_get_size (GtkIconHelper *self,
case GTK_IMAGE_STOCK: case GTK_IMAGE_STOCK:
case GTK_IMAGE_ICON_SET: case GTK_IMAGE_ICON_SET:
case GTK_IMAGE_ANIMATION:
case GTK_IMAGE_EMPTY: case GTK_IMAGE_EMPTY:
default: default:
break; break;
@ -893,12 +900,6 @@ _gtk_icon_helper_get_size (GtkIconHelper *self,
height = self->priv->rendered_surface_height; height = self->priv->rendered_surface_height;
cairo_surface_destroy (surface); cairo_surface_destroy (surface);
} }
else if (gtk_image_definition_get_storage_type (self->priv->def) == GTK_IMAGE_ANIMATION)
{
GdkPixbufAnimation *animation = gtk_image_definition_get_animation (self->priv->def);
width = gdk_pixbuf_animation_get_width (animation);
height = gdk_pixbuf_animation_get_height (animation);
}
else if (self->priv->icon_size != GTK_ICON_SIZE_INVALID) else if (self->priv->icon_size != GTK_ICON_SIZE_INVALID)
{ {
ensure_icon_size (self, &width, &height); ensure_icon_size (self, &width, &height);