AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-21 14:24:19 +00:00
Code Issues Projects Releases Wiki Activity

menubar: Use GtkWidget focusing facilities

Browse Source
This commit is contained in:
Timm Bäder 2018-03-17 10:43:09 +01:00
parent 1eb22e7927
commit 1a8e7d97ae
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gtk/gtkmenubar.c
View File

@ -570,26 +570,30 @@ _gtk_menu_bar_cycle_focus (GtkMenuBar *menubar,
if (gtk_widget_is_toplevel (toplevel))
{
GList *tmp_menubars = _gtk_menu_bar_get_viewable_menu_bars (GTK_WINDOW (toplevel));
GList *menubars;
GList *current;
GList *l;
GPtrArray *menubars;
gboolean found;
guint index;
menubars = _gtk_container_focus_sort (GTK_CONTAINER (toplevel), tmp_menubars,
dir, GTK_WIDGET (menubar));
g_list_free (tmp_menubars);
menubars = g_ptr_array_sized_new (g_list_length (tmp_menubars));
if (menubars)
{
current = g_list_find (menubars, menubar);
for (l = tmp_menubars; l; l = l->next)
g_ptr_array_add (menubars, l->data);
if (current && current->next)
{
GtkMenuShell *new_menushell = GTK_MENU_SHELL (current->next->data);
if (new_menushell->priv->children)
to_activate = new_menushell->priv->children->data;
}
}
g_list_free (menubars);
gtk_widget_focus_sort (toplevel, dir, menubars);
found = g_ptr_array_find (menubars, menubar, &index);
if (found && index < menubars->len)
{
GtkWidget *next = g_ptr_array_index (menubars, index + 1);
GtkMenuShell *new_menushell = GTK_MENU_SHELL (next);
if (new_menushell->priv->children)
to_activate = new_menushell->priv->children->data;
}
g_ptr_array_free (menubars, TRUE);
}
gtk_menu_shell_cancel (GTK_MENU_SHELL (menubar));