From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 15 Apr 2023 12:58:57 +0000 (+0200)
Subject: window: Don't mark widget prematurely as has-focus
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~4^2~10^2~18
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=47070e56630f34a81f6c38a54afa129a492070c1;p=gtk4.git

window: Don't mark widget prematurely as has-focus

has-focus is defined is-focus && toplevel::is-active.
We were forgetting to look at is_active when handling
focus widget changes.
---

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index dced97168b..cf0fd50e3c 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -2023,7 +2023,7 @@ gtk_window_root_set_focus (GtkRoot   *root,
   synthesize_focus_change_events (self, old_focus, focus, GTK_CROSSING_FOCUS);
 
   if (focus)
-    gtk_widget_set_has_focus (focus, TRUE);
+    gtk_widget_set_has_focus (focus, priv->is_active);
 
   g_set_object (&priv->focus_widget, focus);