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

css: Fix the ANY matcher state list

Browse Source 
The ANY and matcher was not, in fact, matching any state,
since the list of states was not up-to-date.

The same fix applies to the superset matcher as well.
This commit is contained in:
Matthias Clasen 2020-01-15 17:34:03 -05:00
parent 2b504201e3
commit 60cd7cd96c
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gtk/gtkcssmatcher.c
View File

@ -383,10 +383,20 @@ gtk_css_matcher_any_get_state (const GtkCssMatcher *matcher)
{ {
/* XXX: This gets tricky when we implement :not() */ /* XXX: This gets tricky when we implement :not() */
return GTK_STATE_FLAG_ACTIVE | GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_SELECTED return GTK_STATE_FLAG_ACTIVE |
| GTK_STATE_FLAG_INSENSITIVE | GTK_STATE_FLAG_INCONSISTENT GTK_STATE_FLAG_PRELIGHT |
| GTK_STATE_FLAG_FOCUSED | GTK_STATE_FLAG_BACKDROP | GTK_STATE_FLAG_LINK GTK_STATE_FLAG_SELECTED |
| GTK_STATE_FLAG_VISITED; GTK_STATE_FLAG_INSENSITIVE |
GTK_STATE_FLAG_INCONSISTENT |
GTK_STATE_FLAG_FOCUSED |
GTK_STATE_FLAG_BACKDROP |
GTK_STATE_FLAG_DIR_LTR |
GTK_STATE_FLAG_DIR_RTL |
GTK_STATE_FLAG_LINK |
GTK_STATE_FLAG_VISITED |
GTK_STATE_FLAG_CHECKED |
GTK_STATE_FLAG_DROP_ACTIVE |
GTK_STATE_FLAG_FOCUS_VISIBLE;
} }
static gboolean static gboolean
@ -464,10 +474,20 @@ gtk_css_matcher_superset_get_state (const GtkCssMatcher *matcher)
if (matcher->superset.relevant & GTK_CSS_CHANGE_STATE) if (matcher->superset.relevant & GTK_CSS_CHANGE_STATE)
return _gtk_css_matcher_get_state (matcher->superset.subset); return _gtk_css_matcher_get_state (matcher->superset.subset);
else else
return GTK_STATE_FLAG_ACTIVE | GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_SELECTED return GTK_STATE_FLAG_ACTIVE |
| GTK_STATE_FLAG_INSENSITIVE | GTK_STATE_FLAG_INCONSISTENT GTK_STATE_FLAG_PRELIGHT |
| GTK_STATE_FLAG_FOCUSED | GTK_STATE_FLAG_BACKDROP | GTK_STATE_FLAG_LINK GTK_STATE_FLAG_SELECTED |
| GTK_STATE_FLAG_VISITED; GTK_STATE_FLAG_INSENSITIVE |
GTK_STATE_FLAG_INCONSISTENT |
GTK_STATE_FLAG_FOCUSED |
GTK_STATE_FLAG_BACKDROP |
GTK_STATE_FLAG_DIR_LTR |
GTK_STATE_FLAG_DIR_RTL |
GTK_STATE_FLAG_LINK |
GTK_STATE_FLAG_VISITED |
GTK_STATE_FLAG_CHECKED |
GTK_STATE_FLAG_DROP_ACTIVE |
GTK_STATE_FLAG_FOCUS_VISIBLE;
} }
static gboolean static gboolean