AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 14:31:10 +00:00
Code Issues Projects Releases Wiki Activity

iconhelper: Rename function

Browse Source 
There are no more icon sizes, this is now the default size we render at.

This naming change is kinda relevant because of CSS terminology.
This commit is contained in:
Benjamin Otte 2018-02-27 01:01:26 +01:00
parent 536714a147
commit 3e50092869
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gtk/gtkiconhelper.c
View File

@ -123,25 +123,16 @@ gtk_icon_helper_init (GtkIconHelper *self,
g_signal_connect_swapped (owner, "notify::scale-factor", G_CALLBACK (gtk_icon_helper_invalidate), self); g_signal_connect_swapped (owner, "notify::scale-factor", G_CALLBACK (gtk_icon_helper_invalidate), self);
} }
static void static int
ensure_icon_size (GtkIconHelper *self, get_default_size (GtkIconHelper *self)
gint *width_out,
gint *height_out)
{ {
gint width, height; GtkCssStyle *style;
if (self->pixel_size != -1) if (self->pixel_size != -1)
{ return self->pixel_size;
width = height = self->pixel_size;
}
else
{
GtkCssStyle *style = gtk_css_node_get_style (self->node);
width = height = _gtk_css_number_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_SIZE), 100);
}
*width_out = width; style = gtk_css_node_get_style (self->node);
*height_out = height; return _gtk_css_number_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_SIZE), 100);
} }
static GtkIconLookupFlags static GtkIconLookupFlags
@ -296,7 +287,7 @@ ensure_paintable_for_gicon (GtkIconHelper *self,
(gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_THEME)); (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_THEME));
flags = get_icon_lookup_flags (self, style, dir); flags = get_icon_lookup_flags (self, style, dir);
ensure_icon_size (self, &width, &height); width = height = get_default_size (self);
info = gtk_icon_theme_lookup_by_gicon_for_scale (icon_theme, info = gtk_icon_theme_lookup_by_gicon_for_scale (icon_theme,
gicon, gicon,
@ -425,7 +416,7 @@ get_size_for_paintable (GtkIconHelper *self,
} }
if (width == 0 || height == 0) if (width == 0 || height == 0)
ensure_icon_size (self, &width, &height); width = height = get_default_size (self);
*width_out = width; *width_out = width;
*height_out = height; *height_out = height;
@ -454,7 +445,7 @@ _gtk_icon_helper_get_size (GtkIconHelper *self,
case GTK_IMAGE_ICON_NAME: case GTK_IMAGE_ICON_NAME:
case GTK_IMAGE_GICON: case GTK_IMAGE_GICON:
if (self->pixel_size != -1 || self->force_scale_pixbuf) if (self->pixel_size != -1 || self->force_scale_pixbuf)
ensure_icon_size (self, &width, &height); width = height = get_default_size (self);
break; break;
case GTK_IMAGE_TEXTURE: case GTK_IMAGE_TEXTURE:
@ -489,7 +480,7 @@ _gtk_icon_helper_get_size (GtkIconHelper *self,
} }
else else
{ {
ensure_icon_size (self, &width, &height); width = height = get_default_size (self);
} }
} }