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

popovermenu: Fix keynav with submenus

Browse Source 
When we right-arrow all the way into a submenu
and then cycle to the next menu in a menubar,
we need to reset all open submenus, so that
left-arrowing back to the menu puts the focus
on the first item again.
This commit is contained in:
Matthias Clasen 2019-12-27 22:52:08 -05:00
parent 28b91a4450
commit 9543a5daeb
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkpopovermenu.c
View File

@ -360,6 +360,7 @@ gtk_popover_menu_focus (GtkWidget *widget,
{
if (GTK_POPOVER_MENU (widget)->open_submenu)
{
g_print ("open submenu\n");
if (gtk_widget_child_focus (GTK_POPOVER_MENU (widget)->open_submenu, direction))
return TRUE;
if (direction == GTK_DIR_LEFT)
@ -440,6 +441,14 @@ add_arrow_bindings (GtkBindingSet *binding_set,
GTK_TYPE_DIRECTION_TYPE, direction);
}
static void
gtk_popover_menu_show (GtkWidget *widget)
{
gtk_popover_menu_set_open_submenu (GTK_POPOVER_MENU (widget), NULL);
GTK_WIDGET_CLASS (gtk_popover_menu_parent_class)->show (widget);
}
static void
gtk_popover_menu_class_init (GtkPopoverMenuClass *klass)
{
@ -454,6 +463,7 @@ gtk_popover_menu_class_init (GtkPopoverMenuClass *klass)
widget_class->map = gtk_popover_menu_map;
widget_class->unmap = gtk_popover_menu_unmap;
widget_class->focus = gtk_popover_menu_focus;
widget_class->show = gtk_popover_menu_show;
g_object_class_install_property (object_class,
PROP_VISIBLE_SUBMENU,