sway

commit 5b1601c2e32b43cbb253fcd396ab9096f51b7e6c
parent 02d385e06f9ca6baccc9fdb35d4ab10532b6c22c
Author: Ryan Dwyer <ryandwyer1@gmail.com>
Date:   Sat, 26 May 2018 21:33:18 +1000

Don't let xwayland views set position unless unmanaged

Diffstat:
M
include/sway/tree/view.h
 | 
1
+
M
sway/desktop/xwayland.c
 | 
5
++++-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
@@ -137,6 +137,7 @@ struct sway_xwayland_view {
 	struct wl_listener unmap;
 	struct wl_listener destroy;
 
+	int pending_lx, pending_ly;
 	int pending_width, pending_height;
 };
 
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
@@ -160,6 +160,8 @@ static void configure(struct sway_view *view, double lx, double ly, int width,
 	}
 	struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
 
+	xwayland_view->pending_lx = lx;
+	xwayland_view->pending_ly = ly;
 	xwayland_view->pending_width = width;
 	xwayland_view->pending_height = height;
 	wlr_xwayland_surface_configure(xsurface, lx, ly, width, height);
@@ -264,7 +266,8 @@ static void handle_commit(struct wl_listener *listener, void *data) {
 	}
 	if (view->swayc && container_is_floating(view->swayc)) {
 		view_update_size(view, xsurface->width, xsurface->height);
-		view_update_position(view, xsurface->x, xsurface->y);
+		view_update_position(view,
+				xwayland_view->pending_lx, xwayland_view->pending_ly);
 	} else {
 		view_update_size(view, xwayland_view->pending_width,
 				xwayland_view->pending_height);