From c2bc9223482288e884f8d4553004a86eccd569e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Thu, 22 Aug 2013 16:24:15 -0700 Subject: [PATCH] xwm: Use window->x/y for override redirect surfaces window->x/y is the coordinate of the top-level surface (whether that's the frame window or an override-redirect window) and the wayland surface should be placed there, without the t->margin offset. --- src/xwayland/window-manager.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/xwayland/window-manager.c b/src/xwayland/window-manager.c index eb7040841..1d35bb0ab 100644 --- a/src/xwayland/window-manager.c +++ b/src/xwayland/window-manager.c @@ -1898,7 +1898,6 @@ xserver_map_shell_surface(struct weston_wm *wm, { struct weston_shell_interface *shell_interface = &wm->server->compositor->shell_interface; - struct theme *t = window->wm->theme; if (!shell_interface->create_shell_surface) return; @@ -1920,8 +1919,8 @@ xserver_map_shell_surface(struct weston_wm *wm, return; } else { shell_interface->set_xwayland(window->shsurf, - window->x + t->margin, - window->y + t->margin, + window->x, + window->y, WL_SHELL_SURFACE_TRANSIENT_INACTIVE); } }