From e481e755afa9a0934e69d2ccc41512170daa31dc Mon Sep 17 00:00:00 2001
From: Ryan <ryan@carelesslisper.xyz>
Date: Sun, 17 Sep 2023 20:18:06 -0400
Subject: [PATCH] fix bartabgroups and systray overlap

Both the bartabgroup systray patches draw to the topbar. This would
result in bartabgroups writing over the bar widgets. This commit fixes
that by making bartabgroup section take the width of the systray into
consdiration when calculating its width.
---
 dwm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dwm.c b/dwm.c
index e1e0d87..ec2d4a5 100644
--- a/dwm.c
+++ b/dwm.c
@@ -985,15 +985,15 @@ drawbar(Monitor *m)
 	x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
 
 	// Draw bartabgroups
-	drw_rect(drw, x, 0, m->ww - tw - x, bh, 1, 1);
+	drw_rect(drw, x, 0, m->ww - tw - stw - x, bh, 1, 1);
 	if ((w = m->ww - tw - stw - x) > bh) {
-		bartabcalculate(m, x, tw, -1, bartabdraw);
+		bartabcalculate(m, x, tw + stw, -1, bartabdraw);
 		if (BARTAB_BOTTOMBORDER) {
 			drw_setscheme(drw, scheme[SchemeTabActive]);
 			drw_rect(drw, 0, bh - 1, m->ww, 1, 1, 0);
 		}
 	}
-	drw_map(drw, m->barwin, 0, 0, m->ww - stw, bh);
+	drw_map(drw, m->barwin, 0, 0, m->ww, bh);
 }
 
 void