[gtk+] Move the -gtk-icon-palette property up
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Move the -gtk-icon-palette property up
- Date: Wed, 13 Jan 2016 21:18:49 +0000 (UTC)
commit 34c263683c1d6cb1d08f2fc9b7d3c66839c7b7db
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Jan 13 16:16:39 2016 -0500
Move the -gtk-icon-palette property up
Other properties will start depending on it in subsequent
commits, so move it up to prevent ordering problems.
gtk/gtkcssstylepropertyimpl.c | 20 ++++++++++----------
gtk/gtkcsstypesprivate.h | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index fa86507..8cb51dd 100644
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -1052,6 +1052,16 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
gtk_css_icon_theme_value_new (NULL));
+ gtk_css_style_property_register ("-gtk-icon-palette",
+ GTK_CSS_PROPERTY_ICON_PALETTE,
+ G_TYPE_NONE,
+ GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_INHERIT,
+ GTK_CSS_AFFECTS_ICON,
+ icon_palette_parse,
+ NULL,
+ NULL,
+ gtk_css_palette_value_new_default ());
+
/* properties that aren't referenced when computing values
* start here */
@@ -1767,16 +1777,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
_gtk_css_icon_effect_value_new (GTK_CSS_ICON_EFFECT_NONE));
- gtk_css_style_property_register ("-gtk-icon-palette",
- GTK_CSS_PROPERTY_ICON_PALETTE,
- G_TYPE_NONE,
- GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_INHERIT,
- GTK_CSS_AFFECTS_ICON,
- icon_palette_parse,
- NULL,
- NULL,
- gtk_css_palette_value_new_default ());
-
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_css_style_property_register ("engine",
diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h
index 082b3f6..4143957 100644
--- a/gtk/gtkcsstypesprivate.h
+++ b/gtk/gtkcsstypesprivate.h
@@ -145,6 +145,7 @@ enum { /*< skip >*/
GTK_CSS_PROPERTY_DPI,
GTK_CSS_PROPERTY_FONT_SIZE,
GTK_CSS_PROPERTY_ICON_THEME,
+ GTK_CSS_PROPERTY_ICON_PALETTE,
GTK_CSS_PROPERTY_BACKGROUND_COLOR,
GTK_CSS_PROPERTY_FONT_FAMILY,
GTK_CSS_PROPERTY_FONT_STYLE,
@@ -219,7 +220,6 @@ enum { /*< skip >*/
GTK_CSS_PROPERTY_ANIMATION_FILL_MODE,
GTK_CSS_PROPERTY_OPACITY,
GTK_CSS_PROPERTY_ICON_EFFECT,
- GTK_CSS_PROPERTY_ICON_PALETTE,
GTK_CSS_PROPERTY_ENGINE,
GTK_CSS_PROPERTY_GTK_KEY_BINDINGS,
GTK_CSS_PROPERTY_CARET_COLOR,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]