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

css: Pass the real context to the CSS lookup

Browse Source 
This will be necessary soon.
This commit is contained in:
Benjamin Otte 2012-01-02 12:36:22 +01:00
parent 91202ef497
commit f2dc63cc6a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtkcsslookup.c
View File

@ -106,8 +106,7 @@ _gtk_css_lookup_set (GtkCssLookup *lookup,
/**
* _gtk_css_lookup_resolve:
* @lookup: the lookup
* @parent: the parent properties to look up inherited values from or %NULL
* if none
* @context: the context the values are resolved for
*
* Resolves the current lookup into a styleproperties object. This is done
* by converting from the "winning declaration" to the "computed value".
@ -119,14 +118,16 @@ _gtk_css_lookup_set (GtkCssLookup *lookup,
**/
GtkStyleProperties *
_gtk_css_lookup_resolve (GtkCssLookup *lookup,
GtkStyleContext *parent)
GtkStyleContext *context)
{
GtkStyleProperties *props;
GtkStyleContext *parent;
guint i, n;
g_return_val_if_fail (lookup != NULL, NULL);
g_return_val_if_fail (parent == NULL || GTK_IS_STYLE_CONTEXT (parent), NULL);
g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), NULL);
parent = gtk_style_context_get_parent (context);
n = _gtk_css_style_property_get_n_properties ();
props = gtk_style_properties_new ();

2
gtk/gtkstylecontext.c
View File

@ -987,7 +987,7 @@ build_properties (GtkStyleContext *context,
}
}
style_data->store = _gtk_css_lookup_resolve (lookup, priv->parent);
style_data->store = _gtk_css_lookup_resolve (lookup, context);
_gtk_style_properties_set_color_lookup_func (style_data->store,
gtk_style_context_color_lookup_func,
context);