diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-07-06 12:14:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-06 12:14:26 -0700 |
| commit | fc4ed6f037f28102921492ee0b0457771defa80f (patch) | |
| tree | 1c5b21dbce5ac24a7ab3d3b9f67482c69838cef5 /sway | |
| parent | 817e847749240a0c04756c37c88dc554efc56c9e (diff) | |
| parent | 9a9d9116be4109f733a3309d7f9a7c9edd8db4ae (diff) | |
Merge pull request #2196 from emersion/xwayland-floating-resize
Fix xwayland floating views unclickable
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/desktop/xwayland.c | 3 | ||||
| -rw-r--r-- | sway/tree/view.c | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 0669a485..b2874cfe 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -283,7 +283,10 @@ static void handle_commit(struct wl_listener *listener, void *data) { if (view->swayc->instructions->length) { transaction_notify_view_ready_by_size(view, surface_state->width, surface_state->height); + } else if (container_is_floating(view->swayc)) { + view_update_size(view, surface_state->width, surface_state->height); } + view_damage_from(view); } diff --git a/sway/tree/view.c b/sway/tree/view.c index bca8ef8a..e46cb327 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -574,6 +574,8 @@ void view_update_position(struct sway_view *view, double lx, double ly) { container_damage_whole(view->swayc); view->x = lx; view->y = ly; + view->swayc->current.view_x = lx; + view->swayc->current.view_y = ly; if (container_is_floating(view->swayc)) { container_set_geometry_from_floating_view(view->swayc); } @@ -587,6 +589,8 @@ void view_update_size(struct sway_view *view, int width, int height) { container_damage_whole(view->swayc); view->width = width; view->height = height; + view->swayc->current.view_width = width; + view->swayc->current.view_height = height; if (container_is_floating(view->swayc)) { container_set_geometry_from_floating_view(view->swayc); } |