mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't let xwayland views set position unless unmanaged

Browse source
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
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 unmap;
struct wl_listener destroy; struct wl_listener destroy;
int pending_lx, pending_ly;
int pending_width, pending_height; 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; 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_width = width;
xwayland_view->pending_height = height; xwayland_view->pending_height = height;
wlr_xwayland_surface_configure(xsurface, lx, ly, width, 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)) { if (view->swayc && container_is_floating(view->swayc)) {
view_update_size(view, xsurface->width, xsurface->height); 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 { } else {
view_update_size(view, xwayland_view->pending_width, view_update_size(view, xwayland_view->pending_width,
xwayland_view->pending_height); xwayland_view->pending_height);