popovermenu: Fix keynav with submenus

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.

diff --git a/gtk/gtkpopovermenu.c b/gtk/gtkpopovermenu.c
index 62993b51e32b34ce96527184ed71b3b4f7471168..447d21171a319723f94e2854c05b9c118a3071c7 100644 (file)
--- a/gtk/gtkpopovermenu.c
+++ b/gtk/gtkpopovermenu.c
@@ -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,