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

widget: Allow focusing widgets with non-container parent

Browse Source 
Especially if said parent also has can-focus set to FALSE, which is a
special-case we had before for GtkContainer instances.
This commit is contained in:
Timm Bäder 2017-02-08 15:50:30 +01:00
parent 0b48bb23b2
commit 0153147ca2
1 changed files with 85 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gtk/gtkwidget.c
View File

@ -7159,8 +7159,6 @@ reset_focus_recurse (GtkWidget *widget,
static void
gtk_widget_real_grab_focus (GtkWidget *focus_widget)
{
if (gtk_widget_get_can_focus (focus_widget))
{
GtkWidget *toplevel;
GtkWidget *widget;
@ -7223,7 +7221,6 @@ gtk_widget_real_grab_focus (GtkWidget *focus_widget)
}
if (GTK_IS_WINDOW (widget))
_gtk_window_internal_set_focus (GTK_WINDOW (widget), focus_widget);
}
}
static gboolean
@ -7314,7 +7311,35 @@ gtk_widget_real_focus (GtkWidget *widget,
GtkDirectionType direction)
{
if (!gtk_widget_get_can_focus (widget))
{
/* @widget can't be focused, but maybe one of its child widgets. */
GtkWidget *focus_child = gtk_widget_get_focus_child (widget);
GtkWidget *child;
for (child = _gtk_widget_get_first_child (widget);
child != NULL;
child = _gtk_widget_get_next_sibling (child))
{
if (focus_child)
{
if (focus_child == child)
{
focus_child = NULL;
if (gtk_widget_child_focus (child, direction))
return TRUE;
}
}
else if (_gtk_widget_is_drawable (child) &&
gtk_widget_is_ancestor (child, widget))
{
if (gtk_widget_child_focus (child, direction))
return TRUE;
}
}
return FALSE;
}
if (!gtk_widget_is_focus (widget))
{