mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't let xwayland views set position unless unmanaged

This commit is contained in:
Ryan Dwyer 2018-05-26 21:33:18 +10:00
parent 02d385e06f
commit 5b1601c2e3
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sway/tree/view.h
View File

@ -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;
};

5
sway/desktop/xwayland.c
View File

@ -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);