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

stylecontext: Refactor some code

Browse Source 
This just changes the arguments passed to build_properties() and moves
that function around in the source file. No functional changes are
happening.
This commit is contained in:
Benjamin Otte
2012-08-24 18:17:07 +02:00
parent 1d7b23845f
commit a770f0c3eb
1 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
gtk/gtkstylecontext.c
View File

@ -890,30 +890,6 @@ gtk_style_context_impl_get_property (GObject *object,
} }
} }
static void
build_properties (GtkStyleContext *context,
StyleData *style_data,
GtkWidgetPath *path,
GtkStateFlags state)
{
GtkStyleContextPrivate *priv;
GtkCssMatcher matcher;
GtkCssLookup *lookup;
priv = context->priv;
lookup = _gtk_css_lookup_new (NULL);
if (_gtk_css_matcher_init (&matcher, path, state))
_gtk_style_provider_private_lookup (GTK_STYLE_PROVIDER_PRIVATE (priv->cascade),
&matcher,
lookup);
style_data->store = _gtk_css_computed_values_new ();
_gtk_css_lookup_resolve (lookup, context, style_data->store);
_gtk_css_lookup_free (lookup);
}
static GtkWidgetPath * static GtkWidgetPath *
create_query_path (GtkStyleContext *context) create_query_path (GtkStyleContext *context)
{ {
@ -952,11 +928,37 @@ create_query_path (GtkStyleContext *context)
return path; return path;
} }
static void
build_properties (GtkStyleContext *context,
GtkCssComputedValues *values,
GtkStateFlags state,
const GtkBitmask *relevant_changes)
{
GtkStyleContextPrivate *priv;
GtkCssMatcher matcher;
GtkWidgetPath *path;
GtkCssLookup *lookup;
priv = context->priv;
path = create_query_path (context);
lookup = _gtk_css_lookup_new (relevant_changes);
if (_gtk_css_matcher_init (&matcher, path, state))
_gtk_style_provider_private_lookup (GTK_STYLE_PROVIDER_PRIVATE (priv->cascade),
&matcher,
lookup);
_gtk_css_lookup_resolve (lookup, context, values);
_gtk_css_lookup_free (lookup);
gtk_widget_path_free (path);
}
static StyleData * static StyleData *
style_data_lookup (GtkStyleContext *context) style_data_lookup (GtkStyleContext *context)
{ {
GtkStyleContextPrivate *priv; GtkStyleContextPrivate *priv;
GtkWidgetPath *path;
GtkStyleInfo *info; GtkStyleInfo *info;
StyleData *data; StyleData *data;
@ -976,17 +978,14 @@ style_data_lookup (GtkStyleContext *context)
return data; return data;
} }
path = create_query_path (context);
data = style_data_new (); data = style_data_new ();
data->store = _gtk_css_computed_values_new ();
style_info_set_data (info, data); style_info_set_data (info, data);
g_hash_table_insert (priv->style_data, g_hash_table_insert (priv->style_data,
style_info_copy (info), style_info_copy (info),
data); data);
build_properties (context, data, path, info->state_flags); build_properties (context, data->store, info->state_flags, NULL);
gtk_widget_path_free (path);
return data; return data;
} }