equal
deleted
inserted
replaced
201 c->th = bh; |
201 c->th = bh; |
202 |
202 |
203 c->border = 0; |
203 c->border = 0; |
204 setsize(c); |
204 setsize(c); |
205 |
205 |
206 if(c->x + c->w > sw) |
206 if(c->x + c->w + 2 > sw) |
207 c->x = sw - c->w - 2; |
207 c->x = sw - c->w - 2; |
208 if(c->x < 0) |
208 if(c->x < 0) |
209 c->x = 0; |
209 c->x = 0; |
210 if(c->y + c->h > sh) |
210 if(c->y + c->h + 2 > sh) |
211 c->y = sh - c->h - 2; |
211 c->y = sh - c->h - 2; |
212 if(c->h != sh && c->y < bh) |
212 if(c->h != sh && c->y < bh) |
213 c->y = bh; |
213 c->y = bh; |
214 |
214 |
215 c->proto = getproto(c->win); |
215 c->proto = getproto(c->win); |
291 if(c->maxw && c->w > c->maxw) |
291 if(c->maxw && c->w > c->maxw) |
292 c->w = c->maxw; |
292 c->w = c->maxw; |
293 if(c->maxh && c->h > c->maxh) |
293 if(c->maxh && c->h > c->maxh) |
294 c->h = c->maxh; |
294 c->h = c->maxh; |
295 } |
295 } |
296 if(c->x > sw) /* might happen on restart */ |
|
297 c->x = sw - c->w; |
|
298 if(c->y > sh) |
|
299 c->y = sh - c->h; |
|
300 if(sticky == TopRight || sticky == BotRight) |
296 if(sticky == TopRight || sticky == BotRight) |
301 c->x = right - c->w; |
297 c->x = right - c->w; |
302 if(sticky == BotLeft || sticky == BotRight) |
298 if(sticky == BotLeft || sticky == BotRight) |
303 c->y = bottom - c->h; |
299 c->y = bottom - c->h; |
304 |
300 |