Merge d4a1ab7b86 into 4cfcb3643b

Important for centered titles

common/util.c

@@ -13,6 +13,10 @@ int wrap(int i, int max) {
 	return ((i % max) + max) % max;
 }
 
+int max(int a, int b){
+	return a > b ? a : b;
+}
+
 bool parse_color(const char *color, uint32_t *result) {
 	if (color[0] == '#') {
 		++color;

include/util.h

@@ -34,6 +34,11 @@ int parse_movement_amount(int argc, char **argv,
  */
 int wrap(int i, int max);
 
+/**
+ * Returns maximum of a and b
+ */
+int max(int a, int b);
+
 /**
  * Given a string that represents an RGB(A) color, result will be set to a
  * uint32_t version of the color, as long as it is valid. If it is invalid,

sway/desktop/transaction.c

@@ -17,6 +17,7 @@
 #include "sway/tree/workspace.h"
 #include "list.h"
 #include "log.h"
+#include "util.h"
 
 struct sway_transaction {
 	struct wl_event_source *timer;
@@ -424,13 +425,13 @@ static void arrange_container(struct sway_container *con,
 		int border_bottom = con->current.border_bottom ? border_width : 0;
 		int border_left = con->current.border_left ? border_width : 0;
 		int border_right = con->current.border_right ? border_width : 0;
-
+		int vert_border_height = max(0, height- border_top - border_bottom);
 		wlr_scene_rect_set_size(con->border.top, width, border_top);
 		wlr_scene_rect_set_size(con->border.bottom, width, border_bottom);
 		wlr_scene_rect_set_size(con->border.left,
-			border_left, height - border_top - border_bottom);
+			border_left, vert_border_height);
 		wlr_scene_rect_set_size(con->border.right,
-			border_right, height - border_top - border_bottom);
+			border_right, vert_border_height);
 
 		wlr_scene_node_set_position(&con->border.top->node, 0, 0);
 		wlr_scene_node_set_position(&con->border.bottom->node,

sway/tree/container.c

@@ -349,7 +349,7 @@ void container_arrange_title_bar(struct sway_container *con) {
 			h_padding = width - config->titlebar_h_padding - marks_buffer_width;
 		}
 
-		h_padding = MAX(h_padding, 0);
+		h_padding = MAX(h_padding, config->titlebar_h_padding);
 
 		int alloc_width = MIN((int)node->width,
 			width - h_padding - config->titlebar_h_padding);
@@ -375,7 +375,7 @@ void container_arrange_title_bar(struct sway_container *con) {
 			h_padding = config->titlebar_h_padding;
 		}
 
-		h_padding = MAX(h_padding, 0);
+		h_padding = MAX(h_padding, config->titlebar_h_padding);
 
 		int alloc_width = MIN((int) node->width,
 			width - h_padding - config->titlebar_h_padding);