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

css: Leftover renaming gtk-image-effect => icon-effect

Browse Source 
The previous renaming commit was incomplete, so here we go again.
This commit is contained in:
Benjamin Otte
2015-12-04 16:53:50 +01:00
parent a37220109f
commit 1b835fc7ce
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/deprecated/gtkiconfactory.c
View File

@ -1443,7 +1443,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
G_GNUC_END_IGNORE_DEPRECATIONS;
effect = _gtk_css_icon_effect_value_get
(_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_GTK_IMAGE_EFFECT));
(_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_EFFECT));
switch (effect)
{

10
gtk/gtkcssenumvalue.c
View File

@ -871,7 +871,7 @@ _gtk_css_fill_mode_value_get (const GtkCssValue *value)
/* GtkCssIconEffect */
static const GtkCssValueClass GTK_CSS_VALUE_IMAGE_EFFECT = {
static const GtkCssValueClass GTK_CSS_VALUE_ICON_EFFECT = {
gtk_css_value_enum_free,
gtk_css_value_enum_compute,
gtk_css_value_enum_equal,
@ -880,9 +880,9 @@ static const GtkCssValueClass GTK_CSS_VALUE_IMAGE_EFFECT = {
};
static GtkCssValue image_effect_values[] = {
{ &GTK_CSS_VALUE_IMAGE_EFFECT, 1, GTK_CSS_ICON_EFFECT_NONE, "none" },
{ &GTK_CSS_VALUE_IMAGE_EFFECT, 1, GTK_CSS_ICON_EFFECT_HIGHLIGHT, "highlight" },
{ &GTK_CSS_VALUE_IMAGE_EFFECT, 1, GTK_CSS_ICON_EFFECT_DIM, "dim" }
{ &GTK_CSS_VALUE_ICON_EFFECT, 1, GTK_CSS_ICON_EFFECT_NONE, "none" },
{ &GTK_CSS_VALUE_ICON_EFFECT, 1, GTK_CSS_ICON_EFFECT_HIGHLIGHT, "highlight" },
{ &GTK_CSS_VALUE_ICON_EFFECT, 1, GTK_CSS_ICON_EFFECT_DIM, "dim" }
};
GtkCssValue *
@ -918,7 +918,7 @@ _gtk_css_icon_effect_value_try_parse (GtkCssParser *parser)
GtkCssIconEffect
_gtk_css_icon_effect_value_get (const GtkCssValue *value)
{
g_return_val_if_fail (value->class == &GTK_CSS_VALUE_IMAGE_EFFECT, GTK_CSS_ICON_EFFECT_NONE);
g_return_val_if_fail (value->class == &GTK_CSS_VALUE_ICON_EFFECT, GTK_CSS_ICON_EFFECT_NONE);
return value->value;
}

2
gtk/gtkcssstylepropertyimpl.c
View File

@ -1727,7 +1727,7 @@ _gtk_css_style_property_init_properties (void)
NULL,
_gtk_css_number_value_new (1, GTK_CSS_NUMBER));
gtk_css_style_property_register ("-gtk-icon-effect",
GTK_CSS_PROPERTY_GTK_IMAGE_EFFECT,
GTK_CSS_PROPERTY_ICON_EFFECT,
G_TYPE_NONE,
GTK_STYLE_PROPERTY_INHERIT,
GTK_CSS_AFFECTS_ICON,

2
gtk/gtkcsstypesprivate.h
View File

@ -216,7 +216,7 @@ enum { /*< skip >*/
GTK_CSS_PROPERTY_ANIMATION_DELAY,
GTK_CSS_PROPERTY_ANIMATION_FILL_MODE,
GTK_CSS_PROPERTY_OPACITY,
GTK_CSS_PROPERTY_GTK_IMAGE_EFFECT,
GTK_CSS_PROPERTY_ICON_EFFECT,
GTK_CSS_PROPERTY_ICON_PALETTE,
GTK_CSS_PROPERTY_ENGINE,
GTK_CSS_PROPERTY_GTK_KEY_BINDINGS,

2
gtk/gtkrender.c
View File

@ -1091,7 +1091,7 @@ gtk_render_icon_pixbuf_for_style (GtkCssStyle *style,
if (!wildcarded)
return scaled;
icon_effect = _gtk_css_icon_effect_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_GTK_IMAGE_EFFECT));
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)
{