Merge remote-tracking branch 'upstream/master'

- Add renamed scratchpads patch - hide systray when there are no systray icons to show
2022-07-01 16:38:19 -04:00
parent 3eddc34482 404401622b
commit 9706cb9cf7
17 changed files with 357 additions and 37 deletions
--- a/patches.def.h
+++ b/patches.def.h
@ -231,6 +231,10 @@

 #define PUSH_NO_MASTER_PATCH 0

+#define RENAMED_SCRATCHPADS_PATCH 0
+
+#define RENAMED_SCRATCHPADS_AUTO_HIDE_PATCH 0
+
 #define REORGANIZETAGS_PATCH 0

 #define RESIZECORNERS_PATCH 1