[gtk/matthiasc/for-master: 3/5] menu: Ignore leaves due to grabs

[Matthias Clasen <matthiasc src gnome org>]

commit 8b64e29ba62ebeadf3130ef740835a2ac8a4992c
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Apr 25 11:46:43 2020 -0400

    menu: Ignore leaves due to grabs
    
    When we open a submenu we get a leave due to the grab,
    but we don't want to unset the active item then.

 gtk/gtkpopovermenu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/gtk/gtkpopovermenu.c b/gtk/gtkpopovermenu.c
index b4a129e147..afe0ac6089 100644
--- a/gtk/gtkpopovermenu.c
+++ b/gtk/gtkpopovermenu.c
@@ -193,7 +193,8 @@ leave_cb (GtkEventController   *controller,
 
   target = gtk_event_controller_get_widget (controller);
 
-  gtk_popover_menu_set_active_item (GTK_POPOVER_MENU (target), NULL);
+  if (mode == GDK_CROSSING_NORMAL)
+    gtk_popover_menu_set_active_item (GTK_POPOVER_MENU (target), NULL);
 }
 
 static void