AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-25 13:11:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix-focus-changes' into 'main'

Browse Source 
window: Fix focus updates

Closes #4903

See merge request GNOME/gtk!5127
This commit is contained in:
Matthias Clasen 2022-10-18 11:02:08 +00:00
commit 94ac1af293
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gtk/gtkwindow.c
View File

@ -184,6 +184,7 @@ typedef struct
GtkWidget *default_widget; GtkWidget *default_widget;
GtkWidget *focus_widget; GtkWidget *focus_widget;
GtkWidget *move_focus_widget;
GtkWindow *transient_parent; GtkWindow *transient_parent;
GtkWindowGeometryInfo *geometry_info; GtkWindowGeometryInfo *geometry_info;
GtkWindowGroup *group; GtkWindowGroup *group;
@ -2003,7 +2004,9 @@ gtk_window_root_set_focus (GtkRoot *root,
if (focus == priv->focus_widget) if (focus == priv->focus_widget)
{ {
priv->move_focus = FALSE; if (priv->move_focus &&
focus && gtk_widget_is_visible (focus))
priv->move_focus = FALSE;
return; return;
} }
@ -2023,7 +2026,9 @@ gtk_window_root_set_focus (GtkRoot *root,
g_clear_object (&old_focus); g_clear_object (&old_focus);
priv->move_focus = FALSE; if (priv->move_focus &&
focus && gtk_widget_is_visible (focus))
priv->move_focus = FALSE;
g_object_notify (G_OBJECT (self), "focus-widget"); g_object_notify (G_OBJECT (self), "focus-widget");
} }
@ -4675,7 +4680,22 @@ maybe_unset_focus_and_default (GtkWindow *window)
GtkWindowPrivate *priv = gtk_window_get_instance_private (window); GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
if (priv->move_focus) if (priv->move_focus)
gtk_widget_child_focus (GTK_WIDGET (window), GTK_DIR_TAB_FORWARD); {
GtkWidget *parent;
parent = _gtk_widget_get_parent (priv->move_focus_widget);
while (parent)
{
if (_gtk_widget_get_visible (parent))
{
if (gtk_widget_grab_focus (parent))
break;
}
parent = _gtk_widget_get_parent (parent);
}
}
if (priv->unset_default) if (priv->unset_default)
gtk_window_set_default_widget (window, NULL); gtk_window_set_default_widget (window, NULL);
@ -5134,7 +5154,10 @@ _gtk_window_unset_focus_and_default (GtkWindow *window,
child = priv->focus_widget; child = priv->focus_widget;
if (child && (child == widget || gtk_widget_is_ancestor (child, widget))) if (child && (child == widget || gtk_widget_is_ancestor (child, widget)))
priv->move_focus = TRUE; {
priv->move_focus_widget = widget;
priv->move_focus = TRUE;
}
child = priv->default_widget; child = priv->default_widget;
if (child && (child == widget || gtk_widget_is_ancestor (child, widget))) if (child && (child == widget || gtk_widget_is_ancestor (child, widget)))