feat: add respect_tiled_min_size option, disable by default

Author: dy-tea

TODO.md

@@ -13,7 +13,6 @@
 
 # Misc
 - Rework the docs to be easier to use
-- Minimum sizes are currently always respected, clipping may be preferred in most cases
 - Improve the README (include video, images, better info)
 
 # Potential

examples/README.md

@@ -343,6 +343,12 @@ doorsctl config left_padding <pixels>
 
 Sets the left padding for all desktops.
 
+```
+doorsctl config respect_tiled_min_size <true|false>
+```
+
+When true, tiled windows will not go below their configured minimum size no matter what.
+
 ```
 doorsctl config normal_border_color <color>
 ```

include/types.h

@@ -266,6 +266,7 @@ extern int border_width;
 extern int window_gap;
 extern bool smart_gaps;
 extern bool smart_borders;
+extern bool respect_tiled_min_size;
 extern bool focus_wrapping;
 extern int focus_on_activate; // focus_on_activate_mode_t
 extern double split_ratio;

src/ipc_cmd/config.c

@@ -82,6 +82,8 @@ void ipc_cmd_config(char **args, int num, int client_fd) {
 		ipc_handle_bool(args, num, client_fd, &smart_gaps, IPC_FLAG_COMMIT);
 	} else if (streq("smart_borders", *args)) {
 		ipc_handle_bool(args, num, client_fd, &smart_borders, IPC_FLAG_COMMIT);
+	} else if (streq("respect_tiled_min_size", *args)) {
+		ipc_handle_bool(args, num, client_fd, &respect_tiled_min_size, IPC_FLAG_COMMIT);
 	} else if (streq("focus_wrapping", *args)) {
 		ipc_handle_bool(args, num, client_fd, &focus_wrapping, IPC_FLAG_COMMIT);
 	} else if (streq("focus_on_activate", *args)) {

src/ipc_cmd/wm.c

@@ -50,6 +50,8 @@ void ipc_cmd_wm(char **args, int num, int client_fd) {
 			smart_gaps ? "true" : "false");
 		offset += snprintf(buf + offset, sizeof(buf) - offset, "    \"smart_borders\": %s,\n",
 			smart_borders ? "true" : "false");
+		offset += snprintf(buf + offset, sizeof(buf) - offset, "    \"respect_tiled_min_size\": %s,\n",
+			respect_tiled_min_size ? "true" : "false");
 		offset += snprintf(buf + offset, sizeof(buf) - offset, "    \"focus_wrapping\": %s,\n",
 			focus_wrapping ? "true" : "false");
 

src/master_stack.c

@@ -142,15 +142,17 @@ static void set_node_geom(node_t *n, struct wlr_box geom, output_t *m, desktop_t
 			r.height = MIN_HEIGHT;
 	}
 
-	if ((int)n->constraints.min_width > MIN_WIDTH && r.width < (int)n->constraints.min_width &&
-			geom.width > 0) {
-		r.x = geom.x + (geom.width - (int)n->constraints.min_width) / 2;
-		r.width = n->constraints.min_width;
-	}
-	if ((int)n->constraints.min_height > MIN_HEIGHT && r.height < (int)n->constraints.min_height &&
-			geom.height > 0) {
-		r.y = geom.y + (geom.height - (int)n->constraints.min_height) / 2;
-		r.height = n->constraints.min_height;
+	if (respect_tiled_min_size) {
+		if ((int)n->constraints.min_width > MIN_WIDTH && r.width < (int)n->constraints.min_width &&
+				geom.width > 0) {
+			r.x = geom.x + (geom.width - (int)n->constraints.min_width) / 2;
+			r.width = n->constraints.min_width;
+		}
+		if ((int)n->constraints.min_height > MIN_HEIGHT && r.height < (int)n->constraints.min_height &&
+				geom.height > 0) {
+			r.y = geom.y + (geom.height - (int)n->constraints.min_height) / 2;
+			r.height = n->constraints.min_height;
+		}
 	}
 
 	n->client->tiled_rectangle = r;

src/tree.c

@@ -60,6 +60,7 @@ int border_width = 2;
 int window_gap = 10;
 bool smart_gaps = false;
 bool smart_borders = false;
+bool respect_tiled_min_size = false;
 bool focus_wrapping = true;
 int focus_on_activate = FOCUS_ON_ACTIVATE_FOCUS;
 double split_ratio = 0.5;
@@ -387,7 +388,7 @@ static void render_leaf(output_t *m, desktop_t *d, node_t *n, struct wlr_box rec
 	}
 
 	// clamp up to constraints and center within the tile slot
-	if (use_centering) {
+	if (respect_tiled_min_size && use_centering) {
 		if ((int)n->constraints.min_width > MIN_WIDTH && r.width < (int)n->constraints.min_width &&
 				slot.width > 0) {
 			r.x = slot.x + (slot.width - (int)n->constraints.min_width) / 2;
@@ -527,15 +528,20 @@ static void compute_split_rects(node_t *n, desktop_t *d, struct wlr_box rect,
 	*first_rect = rect;
 	*second_rect = rect;
 
+	uint16_t first_min_w = respect_tiled_min_size &&
+		n->first_child ? n->first_child->constraints.min_width : 0;
+	uint16_t second_min_w = respect_tiled_min_size &&
+		n->second_child ? n->second_child->constraints.min_width : 0;
+	uint16_t first_min_h = respect_tiled_min_size &&
+		n->first_child ? n->first_child->constraints.min_height : 0;
+	uint16_t second_min_h = respect_tiled_min_size &&
+		n->second_child ? n->second_child->constraints.min_height : 0;
+
 	if (n->split_type == TYPE_VERTICAL) {
-		split_dimension(rect.width, n->split_ratio,
-			n->first_child ? n->first_child->constraints.min_width : 0,
-			n->second_child ? n->second_child->constraints.min_width : 0, &first_rect->width,
+		split_dimension(rect.width, n->split_ratio, first_min_w, second_min_w, &first_rect->width,
 			&second_rect->width, &second_rect->x);
 	} else {
-		split_dimension(rect.height, n->split_ratio,
-			n->first_child ? n->first_child->constraints.min_height : 0,
-			n->second_child ? n->second_child->constraints.min_height : 0, &first_rect->height,
+		split_dimension(rect.height, n->split_ratio, first_min_h, second_min_h, &first_rect->height,
 			&second_rect->height, &second_rect->y);
 	}
 }