AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Remove broken optimization in style modifier overrides

Browse Source 
We used to only set the override color or font if it was different
than the existing value. However, that means you can't change it to
an override that is the same as the default value for the property.

With this fixed you can e.g. override with a color of 0,0,0,0 which
you couldn't before.
This commit is contained in:
Alexander Larsson 2011-12-06 14:09:45 +01:00
parent b558885221
commit 7bd2446801
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/gtkmodifierstyle.c
View File

@ -162,16 +162,6 @@ modifier_style_set_color (GtkModifierStyle *style,
g_return_if_fail (GTK_IS_MODIFIER_STYLE (style));
priv = style->priv;
gtk_style_properties_get (priv->style, state,
prop, &old_color,
NULL);
if ((!color && !old_color) ||
(color && old_color && gdk_rgba_equal (color, old_color)))
{
gdk_rgba_free (old_color);
return;
}
if (color)
gtk_style_properties_set (priv->style, state,
@ -214,19 +204,6 @@ _gtk_modifier_style_set_font (GtkModifierStyle *style,
g_return_if_fail (GTK_IS_MODIFIER_STYLE (style));
priv = style->priv;
gtk_style_properties_get (priv->style, 0,
"font", &old_font,
NULL);
if ((!old_font && !font_desc) ||
(old_font && font_desc &&
pango_font_description_equal (old_font, font_desc)))
{
if (old_font)
pango_font_description_free (old_font);
return;
}
if (font_desc)
gtk_style_properties_set (priv->style, 0,