1 files changed, 14 insertions, 7 deletions

diff --git a/sway/input/seatop_resize_floating.c b/sway/input/seatop_resize_floating.c
index 8400a4b3..bec86e33 100644
--- a/sway/input/seatop_resize_floating.c
+++ b/sway/input/seatop_resize_floating.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <limits.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_xcursor_manager.h>
@@ -21,7 +20,7 @@ struct seatop_resize_floating_event {
 
 static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                 struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state) {
+                enum wl_pointer_button_state state) {
         struct seatop_resize_floating_event *e = seat->seatop_data;
         struct sway_container *con = e->con;
 
@@ -80,17 +79,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);
 
         }