From df245780d28c89ba50cebe485f622d1b2db8c1fc Mon Sep 17 00:00:00 2001 From: emersion Date: Tue, 24 Apr 2018 18:19:26 +0100 Subject: [PATCH] Do not let tiled xwayland views do what they want --- sway/desktop/xwayland.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index cad9156d..63d9c66e 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -266,10 +266,13 @@ static void handle_request_configure(struct wl_listener *listener, void *data) { struct wlr_xwayland_surface_configure_event *ev = data; struct sway_view *view = &xwayland_view->view; struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; - // TODO: floating windows are allowed to move around like this, but make - // sure tiling windows always stay in place. - wlr_xwayland_surface_configure(xsurface, ev->x, ev->y, - ev->width, ev->height); + if (!xsurface->mapped) { + wlr_xwayland_surface_configure(xsurface, ev->x, ev->y, + ev->width, ev->height); + return; + } + // TODO: Let floating views do whatever + configure(view, view->swayc->x, view->swayc->y, view->width, view->height); } static void handle_request_fullscreen(struct wl_listener *listener, void *data) {