prepared yet another hotfix release
2c1db7ed
3 file(s) · +9 −5
| 178 | 178 | resize(Client *c, Bool sizehints) { |
|
| 179 | 179 | XWindowChanges wc; |
|
| 180 | 180 | ||
| 181 | + | if(c->w <= 0 || c->h <= 0) |
|
| 182 | + | return; |
|
| 181 | 183 | if(sizehints) { |
|
| 182 | 184 | if(c->incw) |
|
| 183 | 185 | c->w -= (c->w - c->basew) % c->incw; |
| 1 | 1 | # dwm version |
|
| 2 | - | VERSION = 3.2.1 |
|
| 2 | + | VERSION = 3.2.2 |
|
| 3 | 3 | ||
| 4 | 4 | # Customize below to fit your system |
|
| 5 | 5 |
| 98 | 98 | else { /* tile window */ |
|
| 99 | 99 | c->x += mw; |
|
| 100 | 100 | c->w = tw - 2 * BORDERPX; |
|
| 101 | - | if(th > bh) { |
|
| 101 | + | if(th - 2 * BORDERPX > bh) { |
|
| 102 | 102 | c->y += (i - nmaster) * th; |
|
| 103 | 103 | c->h = th - 2 * BORDERPX; |
|
| 104 | 104 | } |
|
| 105 | - | else /* fallback if th < bh */ |
|
| 105 | + | else /* fallback if th - 2 * BORDERPX < bh */ |
|
| 106 | 106 | c->h = wah - 2 * BORDERPX; |
|
| 107 | 107 | } |
|
| 108 | 108 | resize(c, False); |
|
| 149 | 149 | ||
| 150 | 150 | void |
|
| 151 | 151 | incnmaster(Arg *arg) { |
|
| 152 | - | if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh)) |
|
| 152 | + | if((arrange == dofloat) || (nmaster + arg->i < 1) |
|
| 153 | + | || (wah / (nmaster + arg->i) - 2 * BORDERPX < bh)) |
|
| 153 | 154 | return; |
|
| 154 | 155 | nmaster += arg->i; |
|
| 155 | 156 | if(sel) |
|
| 173 | 174 | if(arg->i == 0) |
|
| 174 | 175 | master = MASTER; |
|
| 175 | 176 | else { |
|
| 176 | - | if(master + arg->i > 950 || master + arg->i < 50) |
|
| 177 | + | if(waw * (master + arg->i) / 1000 > waw - bh - 2 * BORDERPX |
|
| 178 | + | || waw * (master + arg->i) / 1000 < bh + 2 * BORDERPX) |
|
| 177 | 179 | return; |
|
| 178 | 180 | master += arg->i; |
|
| 179 | 181 | } |
|