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

GtkStack: Improve focus handling

Browse Source 
Add notebook-like focus handling: Keep track of the last focused
descendent of each page, and focus it again when switching back
to the page. If there is no last focused child, we move the focus
into the page as if the user had hit Tab.
This commit is contained in:
Matthias Clasen 2014-12-10 22:32:45 -05:00
parent 5dd6ad0057
commit 123c6dc558
1 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gtk/gtkstack.c
View File

@ -112,6 +112,7 @@ struct _GtkStackChildInfo {
gchar *title; gchar *title;
gchar *icon_name; gchar *icon_name;
gboolean needs_attention; gboolean needs_attention;
GtkWidget *last_focus;
}; };
typedef struct { typedef struct {
@ -996,6 +997,9 @@ set_visible_child (GtkStack *stack,
GtkStackChildInfo *info; GtkStackChildInfo *info;
GtkWidget *widget = GTK_WIDGET (stack); GtkWidget *widget = GTK_WIDGET (stack);
GList *l; GList *l;
GtkWidget *toplevel;
GtkWidget *focus;
gboolean contains_focus = FALSE;
/* If none, pick first visible */ /* If none, pick first visible */
if (child_info == NULL) if (child_info == NULL)
@ -1014,6 +1018,25 @@ set_visible_child (GtkStack *stack,
if (child_info == priv->visible_child) if (child_info == priv->visible_child)
return; return;
toplevel = gtk_widget_get_toplevel (widget);
if (GTK_IS_WINDOW (toplevel))
{
focus = gtk_window_get_focus (GTK_WINDOW (toplevel));
if (focus &&
priv->visible_child &&
gtk_widget_is_ancestor (focus, priv->visible_child->widget))
{
contains_focus = TRUE;
if (priv->visible_child->last_focus)
g_object_remove_weak_pointer (G_OBJECT (priv->visible_child->last_focus),
(gpointer *)&priv->visible_child->last_focus);
priv->visible_child->last_focus = focus;
g_object_add_weak_pointer (G_OBJECT (priv->visible_child->last_focus),
(gpointer *)&priv->visible_child->last_focus);
}
}
if (priv->last_visible_child) if (priv->last_visible_child)
gtk_widget_set_child_visible (priv->last_visible_child->widget, FALSE); gtk_widget_set_child_visible (priv->last_visible_child->widget, FALSE);
priv->last_visible_child = NULL; priv->last_visible_child = NULL;
@ -1033,7 +1056,17 @@ set_visible_child (GtkStack *stack,
priv->visible_child = child_info; priv->visible_child = child_info;
if (child_info) if (child_info)
gtk_widget_set_child_visible (child_info->widget, TRUE); {
gtk_widget_set_child_visible (child_info->widget, TRUE);
if (contains_focus)
{
if (child_info->last_focus)
gtk_widget_grab_focus (child_info->last_focus);
else
gtk_widget_child_focus (child_info->widget, GTK_DIR_TAB_FORWARD);
}
}
if ((child_info == NULL || priv->last_visible_child == NULL) && if ((child_info == NULL || priv->last_visible_child == NULL) &&
is_direction_dependent_transition (transition_type)) is_direction_dependent_transition (transition_type))
@ -1164,6 +1197,7 @@ gtk_stack_add (GtkContainer *container,
child_info->title = NULL; child_info->title = NULL;
child_info->icon_name = NULL; child_info->icon_name = NULL;
child_info->needs_attention = FALSE; child_info->needs_attention = FALSE;
child_info->last_focus = NULL;
priv->children = g_list_append (priv->children, child_info); priv->children = g_list_append (priv->children, child_info);
@ -1224,6 +1258,11 @@ gtk_stack_remove (GtkContainer *container,
g_free (child_info->name); g_free (child_info->name);
g_free (child_info->title); g_free (child_info->title);
g_free (child_info->icon_name); g_free (child_info->icon_name);
if (child_info->last_focus)
g_object_remove_weak_pointer (G_OBJECT (child_info->last_focus),
(gpointer *)&child_info->last_focus);
g_slice_free (GtkStackChildInfo, child_info); g_slice_free (GtkStackChildInfo, child_info);
if ((priv->hhomogeneous || priv->vhomogeneous) && was_visible) if ((priv->hhomogeneous || priv->vhomogeneous) && was_visible)