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

Include CSD titlebar in focus chain

Browse Source 
At least for header bars, there's often application controls
in this area, which should be included in the focus chain.
We make it so that the initial focus avoids the titlebar,
but tabbing around will eventually get there.

https://bugzilla.gnome.org/show_bug.cgi?id=708067
This commit is contained in:
Matthias Clasen 2013-09-16 14:26:08 -04:00
parent d3e687ff70
commit aa1435b741
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkwindow.c
View File

@ -7555,7 +7555,7 @@ gtk_window_focus (GtkWidget *widget,
bin = GTK_BIN (widget); bin = GTK_BIN (widget);
old_focus_child = gtk_container_get_focus_child (container); old_focus_child = gtk_container_get_focus_child (container);
/* We need a special implementation here to deal properly with wrapping /* We need a special implementation here to deal properly with wrapping
* around in the tab chain without the danger of going into an * around in the tab chain without the danger of going into an
* infinite loop. * infinite loop.
@ -7587,8 +7587,17 @@ gtk_window_focus (GtkWidget *widget,
gtk_window_set_focus (GTK_WINDOW (container), NULL); gtk_window_set_focus (GTK_WINDOW (container), NULL);
} }
/* Now try to focus the first widget in the window */ /* Now try to focus the first widget in the window,
child = gtk_bin_get_child (bin); * taking care to hook titlebar widgets into the
* focus chain.
*/
if (priv->title_box != NULL &&
old_focus_child != NULL &&
priv->title_box != old_focus_child)
child = priv->title_box;
else
child = gtk_bin_get_child (bin);
if (child) if (child)
{ {
if (gtk_widget_child_focus (child, direction)) if (gtk_widget_child_focus (child, direction))