Merge remote-tracking branch 'upstream/master'

patch/bar_systray.c

@@ -94,6 +94,12 @@ draw_systray(Bar *bar, BarArg *a)
 			i->mon = bar->mon;
 	}
 
+	#if !BAR_ALPHA_PATCH
+	wa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
+	XChangeWindowAttributes(dpy, systray->win, CWBackPixel, &wa);
+	XClearWindow(dpy, systray->win);
+	#endif // BAR_ALPHA_PATCH
+
 	XMoveResizeWindow(dpy, systray->win, bar->bx + a->x + lrpad / 2, (w ? bar->by + a->y + (a->h - systray->h) / 2: -systray->h), MAX(w, 1), systray->h);
 	return w;
 }

patch/xrdb.c

@@ -132,6 +132,11 @@ xrdb(const Arg *arg)
 		#endif // BAR_ALPHA_PATCH
 		ColCount
 		);
+	#if BAR_SYSTRAY_PATCH && !BAR_ALPHA_PATCH
+	if (systray) {
+		XMoveWindow(dpy, systray->win, -32000, -32000);
+	}
+	#endif // BAR_SYSTRAY_PATCH
 	arrange(NULL);
 	focus(NULL);
 }