equal
deleted
inserted
replaced
424 c->h = ev->height; |
424 c->h = ev->height; |
425 if((c->x - sx + c->w) > sw && c->isfloating) |
425 if((c->x - sx + c->w) > sw && c->isfloating) |
426 c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */ |
426 c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */ |
427 if((c->y - sy + c->h) > sh && c->isfloating) |
427 if((c->y - sy + c->h) > sh && c->isfloating) |
428 c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */ |
428 c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */ |
429 if((ev->value_mask & (CWX|CWY)) |
429 if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight))) |
430 && !(ev->value_mask & (CWWidth|CWHeight))) |
|
431 configure(c); |
430 configure(c); |
432 if(!c->isbanned) |
431 if(!c->isbanned) |
433 XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); |
432 XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); |
434 } |
433 } |
435 else |
434 else |
1114 y = sy; |
1113 y = sy; |
1115 if(h < bh) |
1114 if(h < bh) |
1116 h = bh; |
1115 h = bh; |
1117 if(w < bh) |
1116 if(w < bh) |
1118 w = bh; |
1117 w = bh; |
1119 if(c->x != x || c->y != y || c->w != w || c->h != h) { |
1118 if(!c->isbanned || c->x != x || c->y != y || c->w != w || c->h != h) { |
1120 c->x = wc.x = x; |
1119 c->x = wc.x = x; |
1121 c->y = wc.y = y; |
1120 c->y = wc.y = y; |
1122 c->w = wc.width = w; |
1121 c->w = wc.width = w; |
1123 c->h = wc.height = h; |
1122 c->h = wc.height = h; |
1124 wc.border_width = c->bw; |
1123 wc.border_width = c->bw; |