cursor: Move resistance_resize_apply() before view_adjust_size()

This ensures that screen edge resistance does not result in sizes
that violate WM_SIZE_HINTS constraints.

Also correct a coding style issue nearby.

diff --git a/src/cursor.c b/src/cursor.c
index 93c4f03d5bbad1375d2c6a3275825f466e943f98..2ced623cb388161954ed90ded92903bb562997a5 100644 (file)
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -150,16 +150,19 @@ process_cursor_resize(struct server *server, uint32_t time)
                .x = view->x, .y = view->y, .width = view->w, .height = view->h
        };
 
-       if (server->resize_edges & WLR_EDGE_TOP)
+       if (server->resize_edges & WLR_EDGE_TOP) {
                new_view_geo.height = server->grab_box.height - dy;
-       else if (server->resize_edges & WLR_EDGE_BOTTOM)
+       } else if (server->resize_edges & WLR_EDGE_BOTTOM) {
                new_view_geo.height = server->grab_box.height + dy;
+       }
 
-       if (server->resize_edges & WLR_EDGE_LEFT)
+       if (server->resize_edges & WLR_EDGE_LEFT) {
                new_view_geo.width = server->grab_box.width - dx;
-       else if (server->resize_edges & WLR_EDGE_RIGHT)
+       } else if (server->resize_edges & WLR_EDGE_RIGHT) {
                new_view_geo.width = server->grab_box.width + dx;
+       }
 
+       resistance_resize_apply(view, &new_view_geo);
        view_adjust_size(view, &new_view_geo.width, &new_view_geo.height);
 
        if (server->resize_edges & WLR_EDGE_TOP) {
@@ -174,7 +177,6 @@ process_cursor_resize(struct server *server, uint32_t time)
                        server->grab_box.width - new_view_geo.width;
        }
 
-       resistance_resize_apply(view, &new_view_geo);
        view_move_resize(view, new_view_geo);
 }