callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iconfactory: Make state depend on image-effect

Browse Source 
This removes the dependency on state, which should be used for selection
CSS styles, not for actually applying them.

And image-effect does exactly what we want already, so we can start
using it.
This commit is contained in:
Benjamin Otte 2015-12-01 19:41:46 +01:00
parent 6a4b91d0ed
commit 6d65b7d772
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gtk/deprecated/gtkiconfactory.c
View File

@ -972,14 +972,12 @@ gtk_icon_size_get_name (GtkIconSize size)
static GdkPixbuf *find_in_cache (GtkIconSet *icon_set, static GdkPixbuf *find_in_cache (GtkIconSet *icon_set,
GtkStyleContext *style_context, GtkStyleContext *style_context,
GtkTextDirection direction, GtkTextDirection direction,
GtkStateType state,
GtkIconSize size, GtkIconSize size,
gint scale, gint scale,
GtkCssImageEffect effect); GtkCssImageEffect effect);
static void add_to_cache (GtkIconSet *icon_set, static void add_to_cache (GtkIconSet *icon_set,
GtkStyleContext *style_context, GtkStyleContext *style_context,
GtkTextDirection direction, GtkTextDirection direction,
GtkStateType state,
GtkIconSize size, GtkIconSize size,
gint scale, gint scale,
GtkCssImageEffect effect, GtkCssImageEffect effect,
@ -1481,7 +1479,6 @@ gtk_icon_set_render_icon_pixbuf_for_scale (GtkIconSet *icon_set,
gint scale) gint scale)
{ {
GdkPixbuf *icon = NULL; GdkPixbuf *icon = NULL;
GtkStateFlags flags = 0;
GtkStateType state; GtkStateType state;
GtkTextDirection direction; GtkTextDirection direction;
GtkCssImageEffect effect; GtkCssImageEffect effect;
@ -1489,24 +1486,31 @@ gtk_icon_set_render_icon_pixbuf_for_scale (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);
flags = gtk_style_context_get_state (context);
if (flags & GTK_STATE_FLAG_INSENSITIVE)
state = GTK_STATE_INSENSITIVE;
else if (flags & GTK_STATE_FLAG_PRELIGHT)
state = GTK_STATE_PRELIGHT;
else
state = GTK_STATE_NORMAL;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS; G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
direction = gtk_style_context_get_direction (context); direction = gtk_style_context_get_direction (context);
G_GNUC_END_IGNORE_DEPRECATIONS; G_GNUC_END_IGNORE_DEPRECATIONS;
effect = _gtk_css_image_effect_value_get effect = _gtk_css_image_effect_value_get
(_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_GTK_IMAGE_EFFECT)); (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_GTK_IMAGE_EFFECT));
switch (effect)
{
default:
g_assert_not_reached ();
case GTK_CSS_IMAGE_EFFECT_NONE:
state = GTK_STATE_NORMAL;
break;
case GTK_CSS_IMAGE_EFFECT_HIGHLIGHT:
state = GTK_STATE_PRELIGHT;
break;
case GTK_CSS_IMAGE_EFFECT_DIM:
state = GTK_STATE_PRELIGHT;
break;
}
if (icon_set->sources) if (icon_set->sources)
{ {
icon = find_in_cache (icon_set, context, direction, state, size, scale, effect); icon = find_in_cache (icon_set, context, direction, size, scale, effect);
if (icon) if (icon)
return g_object_ref (icon); return g_object_ref (icon);
} }
@ -1518,7 +1522,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS;
if (icon == NULL) if (icon == NULL)
icon = render_fallback_image (context, direction, state, size); icon = render_fallback_image (context, direction, state, size);
add_to_cache (icon_set, context, direction, state, size, scale, effect, icon); add_to_cache (icon_set, context, direction, size, scale, effect, icon);
return icon; return icon;
} }
@ -2439,7 +2443,6 @@ struct _CachedIcon
*/ */
GtkStyleContext *style; GtkStyleContext *style;
GtkTextDirection direction; GtkTextDirection direction;
GtkStateType state;
GtkIconSize size; GtkIconSize size;
gint scale; gint scale;
GtkCssImageEffect effect; GtkCssImageEffect effect;
@ -2470,7 +2473,6 @@ static GdkPixbuf *
find_in_cache (GtkIconSet *icon_set, find_in_cache (GtkIconSet *icon_set,
GtkStyleContext *style_context, GtkStyleContext *style_context,
GtkTextDirection direction, GtkTextDirection direction,
GtkStateType state,
GtkIconSize size, GtkIconSize size,
gint scale, gint scale,
GtkCssImageEffect effect) GtkCssImageEffect effect)
@ -2488,7 +2490,6 @@ find_in_cache (GtkIconSet *icon_set,
if (icon->style == style_context && if (icon->style == style_context &&
icon->direction == direction && icon->direction == direction &&
icon->state == state &&
icon->effect == effect && icon->effect == effect &&
(size == (GtkIconSize)-1 || icon->size == size)) (size == (GtkIconSize)-1 || icon->size == size))
{ {
@ -2514,7 +2515,6 @@ static void
add_to_cache (GtkIconSet *icon_set, add_to_cache (GtkIconSet *icon_set,
GtkStyleContext *style_context, GtkStyleContext *style_context,
GtkTextDirection direction, GtkTextDirection direction,
GtkStateType state,
GtkIconSize size, GtkIconSize size,
gint scale, gint scale,
GtkCssImageEffect effect, GtkCssImageEffect effect,
@ -2532,7 +2532,6 @@ add_to_cache (GtkIconSet *icon_set,
icon->style = g_object_ref (style_context); icon->style = g_object_ref (style_context);
icon->direction = direction; icon->direction = direction;
icon->state = state;
icon->size = size; icon->size = size;
icon->scale = scale; icon->scale = scale;
icon->effect = effect; icon->effect = effect;