From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 15 Jan 2020 22:34:03 +0000 (-0500)
Subject: css: Fix the ANY matcher state list
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~312^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=60cd7cd96c89fbfadbe23889b3ba629a71116bcc;p=gtk4.git

css: Fix the ANY matcher state list

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.
---

diff --git a/gtk/gtkcssmatcher.c b/gtk/gtkcssmatcher.c
index fb80c3ef80..0b2c5442df 100644
--- a/gtk/gtkcssmatcher.c
+++ b/gtk/gtkcssmatcher.c
@@ -383,10 +383,20 @@ gtk_css_matcher_any_get_state (const GtkCssMatcher *matcher)
 {
   /* XXX: This gets tricky when we implement :not() */
 
-  return GTK_STATE_FLAG_ACTIVE | GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_SELECTED
-    | GTK_STATE_FLAG_INSENSITIVE | GTK_STATE_FLAG_INCONSISTENT
-    | GTK_STATE_FLAG_FOCUSED | GTK_STATE_FLAG_BACKDROP | GTK_STATE_FLAG_LINK
-    | GTK_STATE_FLAG_VISITED;
+  return GTK_STATE_FLAG_ACTIVE |
+         GTK_STATE_FLAG_PRELIGHT |
+         GTK_STATE_FLAG_SELECTED |
+         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
@@ -464,10 +474,20 @@ gtk_css_matcher_superset_get_state (const GtkCssMatcher *matcher)
   if (matcher->superset.relevant & GTK_CSS_CHANGE_STATE)
     return _gtk_css_matcher_get_state (matcher->superset.subset);
   else
-    return GTK_STATE_FLAG_ACTIVE | GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_SELECTED
-      | GTK_STATE_FLAG_INSENSITIVE | GTK_STATE_FLAG_INCONSISTENT
-      | GTK_STATE_FLAG_FOCUSED | GTK_STATE_FLAG_BACKDROP | GTK_STATE_FLAG_LINK
-      | GTK_STATE_FLAG_VISITED;
+    return GTK_STATE_FLAG_ACTIVE |
+           GTK_STATE_FLAG_PRELIGHT |
+           GTK_STATE_FLAG_SELECTED |
+           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