[gtk: 5/5] Merge branch 'inspector-menu-fix' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 78d254370c5240b76d320f8ceb374da153843926
Merge: 2952ba07e1 377ec33069
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed May 1 23:01:50 2019 +0000

    Merge branch 'inspector-menu-fix' into 'master'
    
    Inspector menu fix
    
    See merge request GNOME/gtk!804

 gdk/gdkevents.c              | 39 ++++++++++++++++++++++++++++++++++++---
 gdk/gdkeventsprivate.h       |  2 ++
 gdk/gdkseat.c                |  1 +
 gdk/wayland/gdkeventsource.c |  3 +++
 gtk/gtkmenu.c                | 24 +++++++++++++++++++++++-
 5 files changed, 65 insertions(+), 4 deletions(-)
---
diff --cc gtk/gtkmenu.c
index f7d3ab2ff2,bfb2a2ae71..510e204b6d
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@@ -1050,9 -1050,19 +1050,18 @@@ attach_widget_display_changed (GtkWidge
                                 GdkDisplay *previous_display,
                                 GtkMenu    *menu)
  {
 -  if (!g_object_get_data (G_OBJECT (menu), "gtk-menu-explicit-display"))
 -    menu_change_display (menu, gtk_widget_get_display (attach_widget));
 +  menu_change_display (menu, gtk_widget_get_display (attach_widget));
  }
  
+ static void
+ attach_widget_root_changed (GObject    *attach_widget,
+                             GParamSpec *pspec,
+                             gpointer    menu)
+ {
+   if (!g_object_get_data (G_OBJECT (menu), "gtk-menu-explicit-display"))
+     menu_change_display (menu, gtk_widget_get_display (GTK_WIDGET (attach_widget)));
+ }
+ 
  static void
  menu_toplevel_attached_to (GtkWindow *toplevel, GParamSpec *pspec, GtkMenu *menu)
  {