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

cssprovider: Simplify code

Browse Source 
Don't go through an intermediate array when matching styles.
This commit is contained in:
Benjamin Otte 2011-05-16 19:54:57 +02:00
parent f04f943708
commit 08e83ca66b
1 changed files with 13 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
gtk/gtkcssprovider.c
View File

@ -1077,44 +1077,6 @@ gtk_css_provider_init (GtkCssProvider *css_provider)
(GDestroyNotify) gtk_symbolic_color_unref);
}
typedef struct StylePriorityInfo StylePriorityInfo;
struct StylePriorityInfo
{
GHashTable *style;
GtkStateFlags state;
};
static GArray *
css_provider_get_selectors (GtkCssProvider *css_provider,
GtkWidgetPath *path)
{
GtkCssProviderPrivate *priv;
GArray *priority_info;
guint i;
priv = css_provider->priv;
priority_info = g_array_new (FALSE, FALSE, sizeof (StylePriorityInfo));
for (i = 0; i < priv->selectors_info->len; i++)
{
SelectorStyleInfo *info;
StylePriorityInfo new;
info = g_ptr_array_index (priv->selectors_info, i);
if (_gtk_css_selector_matches (info->selector, path))
{
new.style = info->style;
new.state = _gtk_css_selector_get_state_flags (info->selector);
g_array_append_val (priority_info, new);
}
}
return priority_info;
}
static void
css_provider_dump_symbolic_colors (GtkCssProvider *css_provider,
GtkStyleProperties *props)
@ -1143,23 +1105,27 @@ gtk_css_provider_get_style (GtkStyleProvider *provider,
GtkWidgetPath *path)
{
GtkCssProvider *css_provider;
GtkCssProviderPrivate *priv;
GtkStyleProperties *props;
GArray *priority_info;
guint i;
css_provider = GTK_CSS_PROVIDER (provider);
priv = css_provider->priv;
props = gtk_style_properties_new ();
css_provider_dump_symbolic_colors (css_provider, props);
priority_info = css_provider_get_selectors (css_provider, path);
for (i = 0; i < priority_info->len; i++)
for (i = 0; i < priv->selectors_info->len; i++)
{
StylePriorityInfo *info;
SelectorStyleInfo *info;
GHashTableIter iter;
gpointer key, value;
info = &g_array_index (priority_info, StylePriorityInfo, i);
info = g_ptr_array_index (priv->selectors_info, i);
if (!_gtk_css_selector_matches (info->selector, path))
continue;
g_hash_table_iter_init (&iter, info->style);
while (g_hash_table_iter_next (&iter, &key, &value))
@ -1174,12 +1140,13 @@ gtk_css_provider_get_style (GtkStyleProvider *provider,
!gtk_style_properties_lookup_property (prop, NULL, NULL))
continue;
gtk_style_properties_set_property (props, key, info->state, value);
gtk_style_properties_set_property (props,
key,
_gtk_css_selector_get_state_flags (info->selector),
value);
}
}
g_array_free (priority_info, TRUE);
return props;
}