diff options
Diffstat (limited to 'sway/desktop/xwayland.c')
-rw-r--r-- | sway/desktop/xwayland.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 0c41d960..1838ad32 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c | |||
@@ -332,9 +332,11 @@ static void handle_commit(struct wl_listener *listener, void *data) { | |||
332 | } else { | 332 | } else { |
333 | struct wlr_box new_geo; | 333 | struct wlr_box new_geo; |
334 | get_geometry(view, &new_geo); | 334 | get_geometry(view, &new_geo); |
335 | struct sway_container *con = view->container; | ||
335 | 336 | ||
336 | if ((new_geo.width != view->width || new_geo.height != view->height) && | 337 | if ((new_geo.width != con->content_width || |
337 | container_is_floating(view->container)) { | 338 | new_geo.height != con->content_height) && |
339 | container_is_floating(con)) { | ||
338 | // A floating view has unexpectedly sent a new size | 340 | // A floating view has unexpectedly sent a new size |
339 | // eg. The Firefox "Save As" dialog when downloading a file | 341 | // eg. The Firefox "Save As" dialog when downloading a file |
340 | desktop_damage_view(view); | 342 | desktop_damage_view(view); |
@@ -432,13 +434,13 @@ static void handle_request_configure(struct wl_listener *listener, void *data) { | |||
432 | return; | 434 | return; |
433 | } | 435 | } |
434 | if (container_is_floating(view->container)) { | 436 | if (container_is_floating(view->container)) { |
435 | configure(view, view->container->current.view_x, | 437 | configure(view, view->container->current.content_x, |
436 | view->container->current.view_y, ev->width, ev->height); | 438 | view->container->current.content_y, ev->width, ev->height); |
437 | } else { | 439 | } else { |
438 | configure(view, view->container->current.view_x, | 440 | configure(view, view->container->current.content_x, |
439 | view->container->current.view_y, | 441 | view->container->current.content_y, |
440 | view->container->current.view_width, | 442 | view->container->current.content_width, |
441 | view->container->current.view_height); | 443 | view->container->current.content_height); |
442 | } | 444 | } |
443 | } | 445 | } |
444 | 446 | ||