X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;fp=spectrwm.c;h=e84dfb71e0f681afc8215bc403d2a9b0a5ee27cd;hb=1a4854383b53eecf7db1f9bf28a8852e79f942f7;hp=5fc8877587acf17aecf5261a8142119486ebf0bf;hpb=33d4117279c3a01d50133161a94add69f64fa84c;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index 5fc8877..e84dfb7 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -4790,7 +4790,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, bool flip)
 			win_g.y += last_h + 2 * border_width + tile_gap;
 
 		if (disable_border && !(bar_enabled && ws->bar_enabled) &&
-		    winno == 1){
+		    winno == 1) {
 			bordered = false;
 			win_g.w += 2 * border_width;
 			win_g.h += 2 * border_width;
@@ -5003,12 +5003,13 @@ max_stack(struct workspace *ws, struct swm_geometry *g)
 		if (X(w) != gg.x || Y(w) != gg.y || WIDTH(w) != gg.w ||
 		    HEIGHT(w) != gg.h) {
 			w->g = gg;
-			if (bar_enabled && ws->bar_enabled){
-				w->bordered = true;
-			} else {
+
+			if (disable_border && !(bar_enabled && ws->bar_enabled)) {
 				w->bordered = false;
 				WIDTH(w) += 2 * border_width;
 				HEIGHT(w) += 2 * border_width;
+			} else {
+				w->bordered = true;
 			}
 
 			update_window(w);