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

iconhelper: Pass only the CssStyle when loading iconsets

Browse Source
This commit is contained in:
Benjamin Otte 2015-12-07 19:45:55 +01:00
parent 88a490fe58
commit cf77c1695d
5 changed files with 120 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
gtk/deprecated/gtkiconfactory.c
View File

@ -46,6 +46,7 @@
#include "gtkstyle.h" #include "gtkstyle.h"
#include "gtkstylecontextprivate.h" #include "gtkstylecontextprivate.h"
#include "gtkrender.h" #include "gtkrender.h"
#include "gtkrenderprivate.h"
/** /**
* SECTION:gtkiconfactory * SECTION:gtkiconfactory
@ -1222,21 +1223,20 @@ ensure_filename_pixbuf (GtkIconSet *icon_set,
} }
static GdkPixbuf * static GdkPixbuf *
render_icon_name_pixbuf (GtkIconSource *icon_source, render_icon_name_pixbuf (GtkIconSource *icon_source,
GtkStyleContext *context, GtkCssStyle *style,
GtkIconSize size, GtkIconSize size,
gint scale) gint scale)
{ {
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
GdkPixbuf *tmp_pixbuf; GdkPixbuf *tmp_pixbuf;
GtkIconSource tmp_source;
GtkIconTheme *icon_theme; GtkIconTheme *icon_theme;
gint width, height, pixel_size; gint width, height, pixel_size;
gint *sizes, *s, dist; gint *sizes, *s, dist;
GError *error = NULL; GError *error = NULL;
icon_theme = gtk_css_icon_theme_value_get_icon_theme icon_theme = gtk_css_icon_theme_value_get_icon_theme
(_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_THEME)); (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_THEME));
if (!gtk_icon_size_lookup (size, &width, &height)) if (!gtk_icon_size_lookup (size, &width, &height))
{ {
@ -1322,11 +1322,11 @@ render_icon_name_pixbuf (GtkIconSource *icon_source,
return NULL; return NULL;
} }
tmp_source = *icon_source; pixbuf = gtk_render_icon_pixbuf_unpacked (tmp_pixbuf,
tmp_source.type = GTK_ICON_SOURCE_PIXBUF; -1,
tmp_source.source.pixbuf = tmp_pixbuf; gtk_icon_source_get_state_wildcarded (icon_source)
? _gtk_css_icon_effect_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_EFFECT))
pixbuf = gtk_render_icon_pixbuf (context, &tmp_source, -1); : GTK_CSS_ICON_EFFECT_NONE);
if (!pixbuf) if (!pixbuf)
g_warning ("Failed to render icon"); g_warning ("Failed to render icon");
@ -1338,7 +1338,7 @@ render_icon_name_pixbuf (GtkIconSource *icon_source,
static GdkPixbuf * static GdkPixbuf *
find_and_render_icon_source (GtkIconSet *icon_set, find_and_render_icon_source (GtkIconSet *icon_set,
GtkStyleContext *context, GtkCssStyle *style,
GtkTextDirection direction, GtkTextDirection direction,
GtkStateType state, GtkStateType state,
GtkIconSize size, GtkIconSize size,
@ -1371,7 +1371,14 @@ find_and_render_icon_source (GtkIconSet *icon_set,
break; break;
/* Fall through */ /* Fall through */
case GTK_ICON_SOURCE_PIXBUF: case GTK_ICON_SOURCE_PIXBUF:
pixbuf = gtk_render_icon_pixbuf (context, source, size); G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
pixbuf = gtk_render_icon_pixbuf_unpacked (gtk_icon_source_get_pixbuf (source),
gtk_icon_source_get_size_wildcarded (source) ? size : -1,
gtk_icon_source_get_state_wildcarded (source)
? _gtk_css_icon_effect_value_get (
gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_EFFECT))
: GTK_CSS_ICON_EFFECT_NONE);
G_GNUC_END_IGNORE_DEPRECATIONS;
if (!pixbuf) if (!pixbuf)
{ {
g_warning ("Failed to render icon"); g_warning ("Failed to render icon");
@ -1390,7 +1397,7 @@ find_and_render_icon_source (GtkIconSet *icon_set,
break; break;
case GTK_ICON_SOURCE_ICON_NAME: case GTK_ICON_SOURCE_ICON_NAME:
case GTK_ICON_SOURCE_STATIC_ICON_NAME: case GTK_ICON_SOURCE_STATIC_ICON_NAME:
pixbuf = render_icon_name_pixbuf (source, context, pixbuf = render_icon_name_pixbuf (source, style,
size, scale); size, scale);
if (!pixbuf) if (!pixbuf)
failed = g_slist_prepend (failed, source); failed = g_slist_prepend (failed, source);
@ -1406,7 +1413,7 @@ find_and_render_icon_source (GtkIconSet *icon_set,
} }
static GdkPixbuf* static GdkPixbuf*
render_fallback_image (GtkStyleContext *context, render_fallback_image (GtkCssStyle *style,
GtkTextDirection direction, GtkTextDirection direction,
GtkStateType state, GtkStateType state,
GtkIconSize size) GtkIconSize size)
@ -1421,29 +1428,25 @@ render_fallback_image (GtkStyleContext *context,
fallback_source.direction = GTK_TEXT_DIR_NONE; fallback_source.direction = GTK_TEXT_DIR_NONE;
} }
return render_icon_name_pixbuf (&fallback_source, context, size, 1); return render_icon_name_pixbuf (&fallback_source, style, size, 1);
} }
static GdkPixbuf* GdkPixbuf*
gtk_icon_set_render_icon_pixbuf_for_scale (GtkIconSet *icon_set, gtk_icon_set_render_icon_pixbuf_for_scale (GtkIconSet *icon_set,
GtkStyleContext *context, GtkCssStyle *style,
GtkIconSize size, GtkTextDirection direction,
gint scale) GtkIconSize size,
gint scale)
{ {
GdkPixbuf *icon = NULL; GdkPixbuf *icon = NULL;
GtkStateType state; GtkStateType state;
GtkTextDirection direction;
GtkCssIconEffect effect; GtkCssIconEffect effect;
g_return_val_if_fail (icon_set != NULL, NULL); g_return_val_if_fail (icon_set != NULL, NULL);
g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), NULL); g_return_val_if_fail (GTK_IS_CSS_STYLE (style), NULL);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
direction = gtk_style_context_get_direction (context);
G_GNUC_END_IGNORE_DEPRECATIONS;
effect = _gtk_css_icon_effect_value_get effect = _gtk_css_icon_effect_value_get
(_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_EFFECT)); (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_EFFECT));
switch (effect) switch (effect)
{ {
@ -1461,11 +1464,11 @@ G_GNUC_END_IGNORE_DEPRECATIONS;
} }
if (icon_set->sources) if (icon_set->sources)
icon = find_and_render_icon_source (icon_set, context, direction, state, icon = find_and_render_icon_source (icon_set, style, direction, state,
size, scale); size, scale);
if (icon == NULL) if (icon == NULL)
icon = render_fallback_image (context, direction, state, size); icon = render_fallback_image (style, direction, state, size);
return icon; return icon;
} }
@ -1498,7 +1501,13 @@ gtk_icon_set_render_icon_pixbuf (GtkIconSet *icon_set,
g_return_val_if_fail (icon_set != NULL, NULL); g_return_val_if_fail (icon_set != NULL, NULL);
g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), NULL); g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), NULL);
return gtk_icon_set_render_icon_pixbuf_for_scale (icon_set, context, size, 1); G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
return gtk_icon_set_render_icon_pixbuf_for_scale (icon_set,
gtk_style_context_lookup_style (context),
gtk_style_context_get_direction (context),
size,
1);
G_GNUC_END_IGNORE_DEPRECATIONS;
} }
/** /**
@ -1533,7 +1542,13 @@ gtk_icon_set_render_icon_surface (GtkIconSet *icon_set,
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
cairo_surface_t *surface; cairo_surface_t *surface;
pixbuf = gtk_icon_set_render_icon_pixbuf_for_scale (icon_set, context, size, scale); G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
pixbuf = gtk_icon_set_render_icon_pixbuf_for_scale (icon_set,
gtk_style_context_lookup_style (context),
gtk_style_context_get_direction (context),
size,
scale);
G_GNUC_END_IGNORE_DEPRECATIONS;
surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, scale, for_window); surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, scale, for_window);
g_object_unref (pixbuf); g_object_unref (pixbuf);
@ -1599,7 +1614,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
} }
if (!context) if (!context)
return render_fallback_image (context, direction, state, size); return render_fallback_image (gtk_style_context_lookup_style (context), direction, state, size);
gtk_style_context_save (context); gtk_style_context_save (context);

6
gtk/deprecated/gtkiconfactoryprivate.h
View File

@ -23,4 +23,10 @@
GList * _gtk_icon_factory_list_ids (void); GList * _gtk_icon_factory_list_ids (void);
void _gtk_icon_factory_ensure_default_icons (void); void _gtk_icon_factory_ensure_default_icons (void);
GdkPixbuf * gtk_icon_set_render_icon_pixbuf_for_scale (GtkIconSet *icon_set,
GtkCssStyle *style,
GtkTextDirection direction,
GtkIconSize size,
gint scale);
#endif /* __GTK_ICON_FACTORY_PRIVATE_H__ */ #endif /* __GTK_ICON_FACTORY_PRIVATE_H__ */

46
gtk/gtkiconhelper.c
View File

@ -28,6 +28,7 @@
#include "gtkiconthemeprivate.h" #include "gtkiconthemeprivate.h"
#include "gtkrender.h" #include "gtkrender.h"
#include "gtkstylecontextprivate.h" #include "gtkstylecontextprivate.h"
#include "deprecated/gtkiconfactoryprivate.h"
#include "deprecated/gtkstock.h" #include "deprecated/gtkstock.h"
struct _GtkIconHelperPrivate { struct _GtkIconHelperPrivate {
@ -351,17 +352,26 @@ ensure_surface_from_pixbuf (GtkIconHelper *self,
} }
static cairo_surface_t * static cairo_surface_t *
ensure_surface_for_icon_set (GtkIconHelper *self, ensure_surface_for_icon_set (GtkIconHelper *self,
GtkStyleContext *context, GtkCssStyle *style,
gint scale, GtkTextDirection direction,
GtkIconSet *icon_set) gint scale,
GtkIconSet *icon_set)
{ {
G_GNUC_BEGIN_IGNORE_DEPRECATIONS; cairo_surface_t *surface;
return gtk_icon_set_render_icon_surface (icon_set, context, GdkPixbuf *pixbuf;
self->priv->icon_size,
scale, pixbuf = gtk_icon_set_render_icon_pixbuf_for_scale (icon_set,
self->priv->window); style,
G_GNUC_END_IGNORE_DEPRECATIONS; direction,
self->priv->icon_size,
scale);
surface = gdk_cairo_surface_create_from_pixbuf (pixbuf,
scale,
self->priv->window);
g_object_unref (pixbuf);
return surface;
} }
static cairo_surface_t * static cairo_surface_t *
@ -469,18 +479,26 @@ gtk_icon_helper_load_surface (GtkIconHelper *self,
break; break;
case GTK_IMAGE_STOCK: case GTK_IMAGE_STOCK:
G_GNUC_BEGIN_IGNORE_DEPRECATIONS; G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
icon_set = gtk_icon_factory_lookup_default (gtk_image_definition_get_stock (self->priv->def)); icon_set = gtk_icon_factory_lookup_default (gtk_image_definition_get_stock (self->priv->def));
if (icon_set != NULL) if (icon_set != NULL)
surface = ensure_surface_for_icon_set (self, context, scale, icon_set); surface = ensure_surface_for_icon_set (self,
gtk_style_context_lookup_style (context),
gtk_style_context_get_direction (context),
scale, icon_set);
else else
surface = NULL; surface = NULL;
G_GNUC_END_IGNORE_DEPRECATIONS; G_GNUC_END_IGNORE_DEPRECATIONS;
break; break;
case GTK_IMAGE_ICON_SET: case GTK_IMAGE_ICON_SET:
icon_set = gtk_image_definition_get_icon_set (self->priv->def); icon_set = gtk_image_definition_get_icon_set (self->priv->def);
surface = ensure_surface_for_icon_set (self, context, scale, icon_set); G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
surface = ensure_surface_for_icon_set (self,
gtk_style_context_lookup_style (context),
gtk_style_context_get_direction (context),
scale, icon_set);
G_GNUC_END_IGNORE_DEPRECATIONS;
break; break;
case GTK_IMAGE_ICON_NAME: case GTK_IMAGE_ICON_NAME:

66
gtk/gtkrender.c
View File

@ -23,7 +23,6 @@
#include <math.h> #include <math.h>
#include "gtkcsscornervalueprivate.h" #include "gtkcsscornervalueprivate.h"
#include "gtkcssenumvalueprivate.h"
#include "gtkcssimagebuiltinprivate.h" #include "gtkcssimagebuiltinprivate.h"
#include "gtkcssimagevalueprivate.h" #include "gtkcssimagevalueprivate.h"
#include "gtkcssnumbervalueprivate.h" #include "gtkcssnumbervalueprivate.h"
@ -1045,53 +1044,37 @@ scale_or_ref (GdkPixbuf *src,
GDK_INTERP_BILINEAR); GDK_INTERP_BILINEAR);
} }
static GdkPixbuf * GdkPixbuf *
gtk_render_icon_pixbuf_for_style (GtkCssStyle *style, gtk_render_icon_pixbuf_unpacked (GdkPixbuf *base_pixbuf,
const GtkIconSource *source, GtkIconSize size,
GtkIconSize size) GtkCssIconEffect icon_effect)
{ {
GdkPixbuf *scaled; GdkPixbuf *scaled;
GdkPixbuf *stated; GdkPixbuf *stated;
GdkPixbuf *base_pixbuf;
gint width = 1;
gint height = 1;
cairo_surface_t *surface; cairo_surface_t *surface;
gboolean wildcarded;
GtkCssIconEffect icon_effect;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
base_pixbuf = gtk_icon_source_get_pixbuf (source);
G_GNUC_END_IGNORE_DEPRECATIONS;
g_return_val_if_fail (base_pixbuf != NULL, NULL); g_return_val_if_fail (base_pixbuf != NULL, NULL);
if (size != (GtkIconSize) -1 &&
!gtk_icon_size_lookup (size, &width, &height))
{
g_warning (G_STRLOC ": invalid icon size '%d'", size);
return NULL;
}
/* If the size was wildcarded, and we're allowed to scale, then scale; otherwise, /* If the size was wildcarded, and we're allowed to scale, then scale; otherwise,
* leave it alone. * leave it alone.
*/ */
G_GNUC_BEGIN_IGNORE_DEPRECATIONS; if (size != (GtkIconSize) -1)
wildcarded = gtk_icon_source_get_size_wildcarded (source); {
G_GNUC_END_IGNORE_DEPRECATIONS; int width = 1;
if (size != (GtkIconSize) -1 && wildcarded) int height = 1;
scaled = scale_or_ref (base_pixbuf, width, height);
if (!gtk_icon_size_lookup (size, &width, &height))
{
g_warning (G_STRLOC ": invalid icon size '%d'", size);
return NULL;
}
scaled = scale_or_ref (base_pixbuf, width, height);
}
else else
scaled = g_object_ref (base_pixbuf); {
scaled = g_object_ref (base_pixbuf);
/* If the state was wildcarded, then generate a state. */ }
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
wildcarded = gtk_icon_source_get_state_wildcarded (source);
G_GNUC_END_IGNORE_DEPRECATIONS;
if (!wildcarded)
return scaled;
icon_effect = _gtk_css_icon_effect_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_EFFECT));
if (icon_effect != GTK_CSS_ICON_EFFECT_NONE) if (icon_effect != GTK_CSS_ICON_EFFECT_NONE)
{ {
@ -1135,7 +1118,14 @@ gtk_render_icon_pixbuf (GtkStyleContext *context,
g_return_val_if_fail (size > GTK_ICON_SIZE_INVALID || size == (GtkIconSize)-1, NULL); g_return_val_if_fail (size > GTK_ICON_SIZE_INVALID || size == (GtkIconSize)-1, NULL);
g_return_val_if_fail (source != NULL, NULL); g_return_val_if_fail (source != NULL, NULL);
return gtk_render_icon_pixbuf_for_style (gtk_style_context_lookup_style (context), source, size); G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
return gtk_render_icon_pixbuf_unpacked (gtk_icon_source_get_pixbuf (source),
gtk_icon_source_get_size_wildcarded (source) ? size : -1,
gtk_icon_source_get_state_wildcarded (source)
? _gtk_css_icon_effect_value_get (
_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_EFFECT))
: GTK_CSS_ICON_EFFECT_NONE);
G_GNUC_END_IGNORE_DEPRECATIONS;
} }
/** /**

6
gtk/gtkrenderprivate.h
View File

@ -22,6 +22,8 @@
#include <pango/pango.h> #include <pango/pango.h>
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include "gtkcssenumvalueprivate.h"
void gtk_render_content_path (GtkStyleContext *context, void gtk_render_content_path (GtkStyleContext *context,
cairo_t *cr, cairo_t *cr,
double x, double x,
@ -29,4 +31,8 @@ void gtk_render_content_path (GtkStyleContext *context
double width, double width,
double height); double height);
GdkPixbuf * gtk_render_icon_pixbuf_unpacked (GdkPixbuf *base_pixbuf,
GtkIconSize size,
GtkCssIconEffect icon_effect);
#endif /* __GTK_RENDER_PRIVATE_H__ */ #endif /* __GTK_RENDER_PRIVATE_H__ */