AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 06:21:14 +00:00
Code Issues Projects Releases Wiki Activity

wayland: Fix submenu positioning

Browse Source 
window->x / window->y are in "root window coordinates", e.g. relative
to the topmost toplevel. However, the coordinates in get_xdg_popup are
relative to the passed-in surface, so we need to do the reverse
translation here.
This commit is contained in:
Jasper St. Pierre 2014-03-10 13:30:21 -04:00
parent f712cd8850
commit c92a16fcf5
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gdk/wayland/gdkwindow-wayland.c
View File

@ -1068,32 +1068,43 @@ static const struct xdg_popup_listener xdg_popup_listener = {
xdg_popup_done, xdg_popup_done,
}; };
static void
gdk_wayland_window_offset (GdkWindow *window,
gint *x_out,
gint *y_out);
static void static void
gdk_wayland_window_create_xdg_popup (GdkWindow *window, gdk_wayland_window_create_xdg_popup (GdkWindow *window,
GdkWindowImplWayland *parent, GdkWindow *parent,
struct wl_seat *seat, struct wl_seat *seat,
uint32_t flags) uint32_t flags)
{ {
GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (gdk_window_get_display (window)); GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (gdk_window_get_display (window));
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl); GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
GdkWindowImplWayland *parent_impl = GDK_WINDOW_IMPL_WAYLAND (parent->impl);
GdkWaylandDeviceData *device; GdkWaylandDeviceData *device;
int x, y;
int parent_x, parent_y;
if (!impl->surface) if (!impl->surface)
return; return;
if (!parent->surface) if (!parent_impl->surface)
return; return;
device = wl_seat_get_user_data (seat); device = wl_seat_get_user_data (seat);
gdk_wayland_window_offset (parent, &parent_x, &parent_y);
x = window->x - parent_x;
y = window->y - parent_y;
impl->xdg_popup = xdg_shell_get_xdg_popup (display_wayland->xdg_shell, impl->xdg_popup = xdg_shell_get_xdg_popup (display_wayland->xdg_shell,
impl->surface, impl->surface,
parent->surface, parent_impl->surface,
seat, seat,
_gdk_wayland_device_get_button_press_serial (device), _gdk_wayland_device_get_button_press_serial (device),
window->x, x, y, flags);
window->y,
flags);
xdg_popup_add_listener (impl->xdg_popup, &xdg_popup_listener, window); xdg_popup_add_listener (impl->xdg_popup, &xdg_popup_listener, window);
} }
@ -1154,7 +1165,7 @@ gdk_wayland_window_map (GdkWindow *window)
impl->hint == GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU || impl->hint == GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU ||
impl->hint == GDK_WINDOW_TYPE_HINT_COMBO)) impl->hint == GDK_WINDOW_TYPE_HINT_COMBO))
{ {
gdk_wayland_window_create_xdg_popup (window, parent, grab_input_seat, 0); gdk_wayland_window_create_xdg_popup (window, transient_for, grab_input_seat, 0);
goto mapped; goto mapped;
} }
} }