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

Make selectors with no explicit state from higher priority GtkStyleProviders override lower ones with a state.

Browse Source 
This makes overriding information from the themes more intuitive
This commit is contained in:
Carlos Garnacho 2011-01-17 04:06:57 +01:00
parent 5f43a51a83
commit 2f207ca749
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkstyleproperties.c
View File

@ -186,7 +186,7 @@ property_data_new (void)
} }
static void static void
property_data_free (PropertyData *data) property_data_remove_values (PropertyData *data)
{ {
guint i; guint i;
@ -200,6 +200,14 @@ property_data_free (PropertyData *data)
g_value_unset (&value_data->value); g_value_unset (&value_data->value);
} }
if (data->values->len > 0)
g_array_remove_range (data->values, 0, data->values->len);
}
static void
property_data_free (PropertyData *data)
{
property_data_remove_values (data);
g_array_free (data->values, TRUE); g_array_free (data->values, TRUE);
g_slice_free (PropertyData, data); g_slice_free (PropertyData, data);
} }
@ -1203,6 +1211,16 @@ gtk_style_properties_merge (GtkStyleProperties *props,
GValue *value; GValue *value;
data = &g_array_index (prop_to_merge->values, ValueData, i); data = &g_array_index (prop_to_merge->values, ValueData, i);
if (replace && data->state == GTK_STATE_FLAG_NORMAL &&
G_VALUE_TYPE (&data->value) != PANGO_TYPE_FONT_DESCRIPTION)
{
/* Let normal state override all states
* previously set in the original set
*/
property_data_remove_values (prop);
}
value = property_data_get_value (prop, data->state); value = property_data_get_value (prop, data->state);
if (G_VALUE_TYPE (&data->value) == PANGO_TYPE_FONT_DESCRIPTION && if (G_VALUE_TYPE (&data->value) == PANGO_TYPE_FONT_DESCRIPTION &&