diff options
author | emersion <contact@emersion.fr> | 2018-04-28 20:44:42 +0100 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2018-04-28 20:44:42 +0100 |
commit | 3fd8897abe94c34b6457da3209f978b55719a7e2 (patch) | |
tree | d50dc742d8b8bcc2da07c3a784aaa0064a473646 /sway/desktop/xwayland.c | |
parent | Merge pull request #1866 from ggreer/swaybar-cmd-sh (diff) | |
download | sway-3fd8897abe94c34b6457da3209f978b55719a7e2.tar.gz sway-3fd8897abe94c34b6457da3209f978b55719a7e2.tar.zst sway-3fd8897abe94c34b6457da3209f978b55719a7e2.zip |
Don't call view_set_fullscreen on unmapped xwayland views
Diffstat (limited to 'sway/desktop/xwayland.c')
-rw-r--r-- | sway/desktop/xwayland.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 63d9c66e..aa9e1797 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c | |||
@@ -280,6 +280,9 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data) | |||
280 | wl_container_of(listener, xwayland_view, request_fullscreen); | 280 | wl_container_of(listener, xwayland_view, request_fullscreen); |
281 | struct sway_view *view = &xwayland_view->view; | 281 | struct sway_view *view = &xwayland_view->view; |
282 | struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; | 282 | struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; |
283 | if (!xsurface->mapped) { | ||
284 | return; | ||
285 | } | ||
283 | view_set_fullscreen(view, xsurface->fullscreen); | 286 | view_set_fullscreen(view, xsurface->fullscreen); |
284 | } | 287 | } |
285 | 288 | ||
@@ -309,7 +312,6 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) { | |||
309 | 312 | ||
310 | // TODO: | 313 | // TODO: |
311 | // - Look up pid and open on appropriate workspace | 314 | // - Look up pid and open on appropriate workspace |
312 | // - Criteria | ||
313 | 315 | ||
314 | wl_signal_add(&xsurface->events.destroy, &xwayland_view->destroy); | 316 | wl_signal_add(&xsurface->events.destroy, &xwayland_view->destroy); |
315 | xwayland_view->destroy.notify = handle_destroy; | 317 | xwayland_view->destroy.notify = handle_destroy; |