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

stylecontext: Implement the color getters using the regular API

Browse Source 
Has two benefits:
1) Less code
2) I can refactor things
This commit is contained in:
Benjamin Otte
2011-05-30 23:32:09 +02:00
parent 8f6efd00e7
commit abeaad6166
1 changed files with 18 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
gtk/gtkstylecontext.c
View File

@ -505,7 +505,6 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 }; static guint signals[LAST_SIGNAL] = { 0 };
static GQuark provider_list_quark = 0; static GQuark provider_list_quark = 0;
static GdkRGBA fallback_color = { 1.0, 0.75, 0.75, 1.0 };
static void gtk_style_context_finalize (GObject *object); static void gtk_style_context_finalize (GObject *object);
@ -3347,33 +3346,18 @@ gtk_style_context_get_color (GtkStyleContext *context,
GtkStateFlags state, GtkStateFlags state,
GdkRGBA *color) GdkRGBA *color)
{ {
GtkStyleContextPrivate *priv;
StyleData *data;
const GValue *value;
GdkRGBA *c; GdkRGBA *c;
g_return_if_fail (color != NULL); g_return_if_fail (color != NULL);
*color = fallback_color;
g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));
priv = context->priv; gtk_style_context_get (context,
g_return_if_fail (priv->widget_path != NULL);
data = style_data_lookup (context);
value = _gtk_style_properties_peek_property (data->store,
"color",
state, state,
"color", &c,
NULL); NULL);
if (value)
{
c = g_value_get_boxed (value);
if (c)
*color = *c; *color = *c;
else gdk_rgba_free (c);
gdk_rgba_parse (color, "pink");
}
} }
/** /**
@ -3391,33 +3375,18 @@ gtk_style_context_get_background_color (GtkStyleContext *context,
GtkStateFlags state, GtkStateFlags state,
GdkRGBA *color) GdkRGBA *color)
{ {
GtkStyleContextPrivate *priv;
StyleData *data;
const GValue *value;
GdkRGBA *c; GdkRGBA *c;
g_return_if_fail (color != NULL); g_return_if_fail (color != NULL);
*color = fallback_color;
g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));
priv = context->priv; gtk_style_context_get (context,
g_return_if_fail (priv->widget_path != NULL);
data = style_data_lookup (context);
value = _gtk_style_properties_peek_property (data->store,
"background-color",
state, state,
"background-color", &c,
NULL); NULL);
if (value)
{
c = g_value_get_boxed (value);
if (c)
*color = *c; *color = *c;
else gdk_rgba_free (c);
gdk_rgba_parse (color, "pink");
}
} }
/** /**
@ -3435,33 +3404,18 @@ gtk_style_context_get_border_color (GtkStyleContext *context,
GtkStateFlags state, GtkStateFlags state,
GdkRGBA *color) GdkRGBA *color)
{ {
GtkStyleContextPrivate *priv;
StyleData *data;
const GValue *value;
GdkRGBA *c; GdkRGBA *c;
g_return_if_fail (color != NULL); g_return_if_fail (color != NULL);
*color = fallback_color;
g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));
priv = context->priv; gtk_style_context_get (context,
g_return_if_fail (priv->widget_path != NULL);
data = style_data_lookup (context);
value = _gtk_style_properties_peek_property (data->store,
"border-color",
state, state,
"border-color", &c,
NULL); NULL);
if (value)
{
c = g_value_get_boxed (value);
if (c)
*color = *c; *color = *c;
else gdk_rgba_free (c);
gdk_rgba_parse (color, "pink");
}
} }
/** /**