From fdc4335eba5acd7cad4c96d8bf375e783e07437d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 25 Apr 2020 12:14:04 -0400
Subject: [PATCH] menu: Dismiss submenus during keynav

We need to dismiss submenus explicitly on left arrow,
otherwise the grab interferes with our keynav.
---
 gtk/gtkpopovermenu.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gtk/gtkpopovermenu.c b/gtk/gtkpopovermenu.c
index ef33391408..acb2bc7179 100644
--- a/gtk/gtkpopovermenu.c
+++ b/gtk/gtkpopovermenu.c
@@ -336,6 +336,12 @@ gtk_popover_menu_focus (GtkWidget        *widget,
             return TRUE;
           if (direction == GTK_DIR_LEFT)
             {
+              if (menu->open_submenu)
+                {
+                  gtk_popover_popdown (GTK_POPOVER (menu->open_submenu));
+                  menu->open_submenu = NULL;
+                }
+
               gtk_widget_grab_focus (menu->active_item);
 
               return TRUE;