gtkwindow: Clear active state on sensitiveness changes

When altering the broken implicit grab due to sensitiveness changes,
also ensure to clear the active state from the affected actors. This
fixes unbalanced implicit active state accounting on the widgets going
insensitive.

Closes: https://gitlab.gnome.org/GNOME/gtk/-/issues/5529

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index bac2a25b89053cb4429f337a78bd0c2f60f057ac..9c94d9726f4102c41c8357efde03aeefcad4af09 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6517,6 +6517,21 @@ gtk_window_update_pointer_focus (GtkWindow        *window,
     }
 }
 
+static void
+clear_widget_active_state (GtkWidget *widget,
+                           GtkWidget *topmost)
+{
+  GtkWidget *w = widget;
+
+  while (w)
+    {
+      gtk_widget_set_active_state (w, FALSE);
+      if (w == topmost)
+        break;
+      w = _gtk_widget_get_parent (w);
+    }
+}
+
 void
 gtk_window_update_pointer_focus_on_state_change (GtkWindow *window,
                                                  GtkWidget *widget)
@@ -6537,7 +6552,10 @@ gtk_window_update_pointer_focus_on_state_change (GtkWindow *window,
       if (focus->grab_widget &&
           (focus->grab_widget == widget ||
            gtk_widget_is_ancestor (focus->grab_widget, widget)))
-        gtk_pointer_focus_set_implicit_grab (focus, NULL);
+        {
+          clear_widget_active_state (focus->grab_widget, widget);
+          gtk_pointer_focus_set_implicit_grab (focus, NULL);
+        }
 
       if (GTK_WIDGET (focus->toplevel) == widget)
         {