Merge pull request #2196 from emersion/xwayland-floating-resize

Fix xwayland floating views unclickable

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);
         }