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

window: Use widget facilities to sort focus menubars

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

19
gtk/gtkwindow.c
View File

@ -10152,10 +10152,11 @@ gtk_window_activate_menubar (GtkWindow *window,
((event->state & gtk_accelerator_get_default_mod_mask ()) ==
(mods & gtk_accelerator_get_default_mod_mask ())))
{
GList *tmp_menubars;
GList *menubars;
GList *tmp_menubars, *l;
GPtrArray *menubars;
GtkMenuShell *menu_shell;
GtkWidget *focus;
GtkWidget *first;
focus = gtk_window_get_focus (window);
@ -10168,19 +10169,21 @@ gtk_window_activate_menubar (GtkWindow *window,
if (tmp_menubars == NULL)
return FALSE;
menubars = _gtk_container_focus_sort (GTK_CONTAINER (window), tmp_menubars,
GTK_DIR_TAB_FORWARD, NULL);
menubars = g_ptr_array_sized_new (g_list_length (tmp_menubars));;
for (l = tmp_menubars; l; l = l->next)
g_ptr_array_add (menubars, l->data);
g_list_free (tmp_menubars);
if (menubars == NULL)
return FALSE;
gtk_widget_focus_sort (GTK_WIDGET (window), GTK_DIR_TAB_FORWARD, menubars);
menu_shell = GTK_MENU_SHELL (menubars->data);
first = g_ptr_array_index (menubars, 0);
menu_shell = GTK_MENU_SHELL (first);
_gtk_menu_shell_set_keyboard_mode (menu_shell, TRUE);
gtk_menu_shell_select_first (menu_shell, FALSE);
g_list_free (menubars);
g_ptr_array_free (menubars, TRUE);
return TRUE;
}