Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

css: Small cleanup for the superset matcher

Browse Source 
Don't lump name and id together here, we have separate
change flags, after all. Update the only caller to
pass GTK_CSS_CHANGE_ID as well.
This commit is contained in:
Matthias Clasen
2020-01-15 17:40:34 -05:00
parent fdfb3e9177
commit ac5e686cfa
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtkcssmatcher.c
View File

@@ -532,7 +532,12 @@ _gtk_css_matcher_superset_init (GtkCssMatcher *matcher,
GtkCssChange relevant)
{
g_return_if_fail (subset != NULL);
g_return_if_fail ((relevant & ~(GTK_CSS_CHANGE_CLASS | GTK_CSS_CHANGE_NAME | GTK_CSS_CHANGE_POSITION | GTK_CSS_CHANGE_STATE | GTK_CSS_CHANGE_HOVER)) == 0);
g_return_if_fail ((relevant & ~(GTK_CSS_CHANGE_CLASS |
GTK_CSS_CHANGE_NAME |
GTK_CSS_CHANGE_ID |
GTK_CSS_CHANGE_POSITION |
GTK_CSS_CHANGE_STATE |
GTK_CSS_CHANGE_HOVER)) == 0);
switch (subset->klass->type)
{
@@ -556,7 +561,7 @@ _gtk_css_matcher_superset_init (GtkCssMatcher *matcher,
klass->has_class = subset->klass->has_class;
if (relevant & GTK_CSS_CHANGE_NAME)
klass->has_name = subset->klass->has_name;
if (relevant & GTK_CSS_CHANGE_NAME)
if (relevant & GTK_CSS_CHANGE_ID)
klass->has_id = subset->klass->has_id;
if (relevant & GTK_CSS_CHANGE_POSITION)
klass->has_position = subset->klass->has_position;

2
gtk/gtkcssprovider.c
View File

@@ -537,7 +537,7 @@ gtk_css_style_provider_lookup (GtkStyleProvider *provider,
GtkCssMatcher change_matcher;
GtkCssMatcherClass matcher_class;
_gtk_css_matcher_superset_init (&change_matcher, matcher, &matcher_class, GTK_CSS_CHANGE_CLASS | GTK_CSS_CHANGE_NAME);
_gtk_css_matcher_superset_init (&change_matcher, matcher, &matcher_class, GTK_CSS_CHANGE_CLASS | GTK_CSS_CHANGE_NAME | GTK_CSS_CHANGE_ID);
*change = get_change (css_provider, &change_matcher);
}