fix: unbreak master_stack

Author: dy-tea

TODO.md

@@ -12,7 +12,6 @@
 
 # Layout
 - Better tab grouping (see sway or Hyprland for reference)
-- Master stack appears to be broken since layout refactor into vtable
 
 # Misc
 - Rework the docs to be easier to use

src/layout.c

@@ -155,12 +155,11 @@ static bool master_stack_swap(output_t *m, desktop_t *d, direction_t dir) {
 }
 
 static bool tiled_swap(output_t *m, desktop_t *d, direction_t dir) {
-	(void)m;
 	node_t *n = find_fence(d->focus, dir);
 	if (n != NULL) {
 		n = first_extrema(n);
 		if (n != NULL) {
-			swap_nodes(mon, d, d->focus, mon, d, n);
+			swap_nodes(m, d, d->focus, m, d, n);
 			return true;
 		}
 	}

src/master_stack.c

@@ -156,6 +156,7 @@ static void set_node_geom(node_t *n, struct wlr_box geom, output_t *m, desktop_t
 	}
 
 	n->client->tiled_rectangle = r;
+	n->client->arranged_rectangle = r;
 	node_set_pending_rectangle(n, geom);
 	n->output = m;
 	node_set_dirty(n);

src/tree.c

@@ -326,11 +326,10 @@ void arrange(output_t *m, desktop_t *d, bool use_transaction) {
 		return;
 	}
 
-	struct wlr_box rect;
-	if (m)
-		rect = m->usable_area;
-	else
-		rect = m->rectangle;
+	if (m == NULL)
+		return;
+
+	struct wlr_box rect = m->usable_area;
 
 	rect.x += m->padding.left + d->padding.left;
 	rect.y += m->padding.top + d->padding.top;