Merge remote-tracking branch 'upstream/master'
This commit is contained in:
		@@ -94,6 +94,12 @@ draw_systray(Bar *bar, BarArg *a)
 | 
				
			|||||||
			i->mon = bar->mon;
 | 
								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);
 | 
						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;
 | 
						return w;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -132,6 +132,11 @@ xrdb(const Arg *arg)
 | 
				
			|||||||
		#endif // BAR_ALPHA_PATCH
 | 
							#endif // BAR_ALPHA_PATCH
 | 
				
			||||||
		ColCount
 | 
							ColCount
 | 
				
			||||||
		);
 | 
							);
 | 
				
			||||||
 | 
						#if BAR_SYSTRAY_PATCH && !BAR_ALPHA_PATCH
 | 
				
			||||||
 | 
						if (systray) {
 | 
				
			||||||
 | 
							XMoveWindow(dpy, systray->win, -32000, -32000);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						#endif // BAR_SYSTRAY_PATCH
 | 
				
			||||||
	arrange(NULL);
 | 
						arrange(NULL);
 | 
				
			||||||
	focus(NULL);
 | 
						focus(NULL);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user