diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-04-25 11:00:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-25 11:00:56 +0200 |
| commit | c54097428a8f36e456d203d986d76702bd339066 (patch) | |
| tree | ec248905f4c73d8f52c3e2c08ce26decbda2d704 /sway/desktop/xwayland.c | |
| parent | dfc26c664f8c1b007f15ff24a3055774af200c69 (diff) | |
| parent | 75674295504af9118d2af3c8677d8e1e84e85e77 (diff) | |
Merge branch 'master' into criteria-commands
Diffstat (limited to 'sway/desktop/xwayland.c')
| -rw-r--r-- | sway/desktop/xwayland.c | 11 |
1 files 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) { |