1 files changed, 33 insertions, 21 deletions

diff --git a/sway/input/seatop_resize_floating.c b/sway/input/seatop_resize_floating.c
index 5da22e47..df683026 100644
--- a/sway/input/seatop_resize_floating.c
+++ b/sway/input/seatop_resize_floating.c
@@ -2,6 +2,7 @@
 #include <limits.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_xcursor_manager.h>
+#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 #include "sway/tree/arrange.h"
@@ -27,6 +28,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
         if (seat->cursor->pressed_button_count == 0) {
                 container_set_resizing(con, false);
                 arrange_container(con); // Send configure w/o resizing hint
+                transaction_commit_dirty();
                 seatop_begin_default(seat);
         }
 }
@@ -78,17 +80,25 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
         double height = e->ref_height + grow_height;
         int min_width, max_width, min_height, max_height;
         floating_calculate_constraints(&min_width, &max_width,
-                        &min_height, &max_height);
-        width = fmax(min_width + border_width, fmin(width, max_width));
-        height = fmax(min_height + border_height, fmin(height, max_height));
+                &min_height, &max_height);
+        width = fmin(width, max_width - border_width);
+        width = fmax(width, min_width + border_width);
+        width = fmax(width, 1);
+        height = fmin(height, max_height - border_height);
+        height = fmax(height, min_height + border_height);
+        height = fmax(height, 1);
 
         // Apply the view's min/max size
         if (con->view) {
                 double view_min_width, view_max_width, view_min_height, view_max_height;
                 view_get_constraints(con->view, &view_min_width, &view_max_width,
                                 &view_min_height, &view_max_height);
-                width = fmax(view_min_width + border_width, fmin(width, view_max_width));
-                height = fmax(view_min_height + border_height, fmin(height, view_max_height));
+                width = fmin(width, view_max_width - border_width);
+                width = fmax(width, view_min_width + border_width);
+                width = fmax(width, 1);
+                height = fmin(height, view_max_height - border_height);
+                height = fmax(height, view_min_height + border_height);
+                height = fmax(height, 1);
 
         }
 
@@ -116,23 +126,24 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
 
         // Determine the amounts we need to bump everything relative to the current
         // size.
-        int relative_grow_width = width - con->width;
-        int relative_grow_height = height - con->height;
-        int relative_grow_x = (e->ref_con_lx + grow_x) - con->x;
-        int relative_grow_y = (e->ref_con_ly + grow_y) - con->y;
+        int relative_grow_width = width - con->pending.width;
+        int relative_grow_height = height - con->pending.height;
+        int relative_grow_x = (e->ref_con_lx + grow_x) - con->pending.x;
+        int relative_grow_y = (e->ref_con_ly + grow_y) - con->pending.y;
 
         // Actually resize stuff
-        con->x += relative_grow_x;
-        con->y += relative_grow_y;
-        con->width += relative_grow_width;
-        con->height += relative_grow_height;
+        con->pending.x += relative_grow_x;
+        con->pending.y += relative_grow_y;
+        con->pending.width += relative_grow_width;
+        con->pending.height += relative_grow_height;
 
-        con->content_x += relative_grow_x;
-        con->content_y += relative_grow_y;
-        con->content_width += relative_grow_width;
-        con->content_height += relative_grow_height;
+        con->pending.content_x += relative_grow_x;
+        con->pending.content_y += relative_grow_y;
+        con->pending.content_width += relative_grow_width;
+        con->pending.content_height += relative_grow_height;
 
         arrange_container(con);
+        transaction_commit_dirty();
 }
 
 static void handle_unref(struct sway_seat *seat, struct sway_container *con) {
@@ -166,16 +177,17 @@ void seatop_begin_resize_floating(struct sway_seat *seat,
         e->edge = edge == WLR_EDGE_NONE ? WLR_EDGE_BOTTOM | WLR_EDGE_RIGHT : edge;
         e->ref_lx = seat->cursor->cursor->x;
         e->ref_ly = seat->cursor->cursor->y;
-        e->ref_con_lx = con->x;
-        e->ref_con_ly = con->y;
-        e->ref_width = con->width;
-        e->ref_height = con->height;
+        e->ref_con_lx = con->pending.x;
+        e->ref_con_ly = con->pending.y;
+        e->ref_width = con->pending.width;
+        e->ref_height = con->pending.height;
 
         seat->seatop_impl = &seatop_impl;
         seat->seatop_data = e;
 
         container_set_resizing(con, true);
         container_raise_floating(con);
+        transaction_commit_dirty();
 
         const char *image = edge == WLR_EDGE_NONE ?
                 "se-resize" : wlr_xcursor_get_resize_name(edge);