From da5e69c4a7b322683f70f2677309017650c0c79d Mon Sep 17 00:00:00 2001
From: bakkeby <bakkeby@gmail.com>
Date: Thu, 10 Mar 2022 09:35:12 +0100
Subject: [PATCH] holdbar + systray compatibility - make systray follow the bar
 when being revealed and hidden ref. #239

---
 patch/bar_holdbar.c | 5 +++++
 patch/include.c     | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/patch/bar_holdbar.c b/patch/bar_holdbar.c
index 1e00dc8..7597a38 100644
--- a/patch/bar_holdbar.c
+++ b/patch/bar_holdbar.c
@@ -8,6 +8,7 @@ holdbar(const Arg *arg)
 	updatebarpos(selmon);
 	for (bar = selmon->bar; bar; bar = bar->next)
 		XMoveResizeWindow(dpy, bar->win, bar->bx, bar->by, bar->bw, bar->bh);
+	drawbar(selmon);
 }
 
 void
@@ -29,6 +30,10 @@ keyrelease(XEvent *e)
 		updatebarpos(selmon);
 		for (bar = selmon->bar; bar; bar = bar->next)
 			XMoveResizeWindow(dpy, bar->win, bar->bx, bar->by, bar->bw, bar->bh);
+		#if BAR_SYSTRAY_PATCH
+		if (!selmon->showbar && systray)
+			XMoveWindow(dpy, systray->win, -32000, -32000);
+		#endif // BAR_SYSTRAY_PATCH
 		arrange(selmon);
 	}
 	#if COMBO_PATCH
diff --git a/patch/include.c b/patch/include.c
index d47c6fd..676e2ae 100644
--- a/patch/include.c
+++ b/patch/include.c
@@ -20,9 +20,6 @@
 #if COMBO_PATCH
 #include "combo.c"
 #endif
-#if BAR_HOLDBAR_PATCH
-#include "bar_holdbar.c"
-#endif
 #if BAR_LTSYMBOL_PATCH
 #include "bar_ltsymbol.c"
 #endif
@@ -83,6 +80,9 @@
 #if BAR_SYSTRAY_PATCH
 #include "bar_systray.c"
 #endif
+#if BAR_HOLDBAR_PATCH
+#include "bar_holdbar.c"
+#endif
 #if BAR_VTCOLORS_PATCH
 #include "bar_vtcolors.c"
 #endif