equal
deleted
inserted
replaced
911 if(c->x + c->w + 2 * c->bw > sx + sw) |
911 if(c->x + c->w + 2 * c->bw > sx + sw) |
912 c->x = sx + sw - c->w - 2 * c->bw; |
912 c->x = sx + sw - c->w - 2 * c->bw; |
913 if(c->y + c->h + 2 * c->bw > sy + sh) |
913 if(c->y + c->h + 2 * c->bw > sy + sh) |
914 c->y = sy + sh - c->h - 2 * c->bw; |
914 c->y = sy + sh - c->h - 2 * c->bw; |
915 c->x = MAX(c->x, sx); |
915 c->x = MAX(c->x, sx); |
916 c->y = MAX(c->y, by == 0 ? bh : sy); |
916 /* only fix client y-offset, if the client center might cover the bar */ |
|
917 c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy); |
917 c->bw = borderpx; |
918 c->bw = borderpx; |
918 } |
919 } |
919 |
920 |
920 wc.border_width = c->bw; |
921 wc.border_width = c->bw; |
921 XConfigureWindow(dpy, w, CWBorderWidth, &wc); |
922 XConfigureWindow(dpy, w, CWBorderWidth, &wc); |