summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <mrgarnacho@gmail.com>2019-04-01 11:10:54 +0000
committerCarlos Garnacho <mrgarnacho@gmail.com>2019-04-01 11:10:54 +0000
commit892abdd41b28c22304933cc9e90c9534592fed2b (patch)
tree3c2ca58b8d6c44cbbbba61c9ff0e671de04c8ce3
parent59a272fdeffd6375840f4db3ff95e0f66af4f834 (diff)
parent35c4627fac119a7259fc0450e26091ea58173069 (diff)
downloadgtk+-892abdd41b28c22304933cc9e90c9534592fed2b.tar.gz
Merge branch 'wayland_window_menu' into 'gtk-3-24'
gdk/wayland: Properly calculate coordinates for show_window_menu() See merge request GNOME/gtk!684
-rw-r--r--gdk/wayland/gdkwindow-wayland.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 70f1044d9b..7007f30ce3 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -4478,6 +4478,12 @@ gdk_wayland_window_show_window_menu (GdkWindow *window,
seat = gdk_wayland_device_get_wl_seat (GDK_DEVICE (device));
gdk_event_get_coords (event, &x, &y);
+ while (gdk_window_get_window_type (window) != GDK_WINDOW_TOPLEVEL)
+ {
+ gdk_window_coords_to_parent (window, x, y, &x, &y);
+ window = gdk_window_get_effective_parent (window);
+ }
+
serial = _gdk_wayland_device_get_implicit_grab_serial (device, event);
switch (display_wayland->shell_variant)