equal
deleted
inserted
replaced
96 c->h = mh - 2 * BORDERPX; |
96 c->h = mh - 2 * BORDERPX; |
97 } |
97 } |
98 else { /* tile window */ |
98 else { /* tile window */ |
99 c->x += mw; |
99 c->x += mw; |
100 c->w = tw - 2 * BORDERPX; |
100 c->w = tw - 2 * BORDERPX; |
101 if(th > bh) { |
101 if(th - 2 * BORDERPX > bh) { |
102 c->y += (i - nmaster) * th; |
102 c->y += (i - nmaster) * th; |
103 c->h = th - 2 * BORDERPX; |
103 c->h = th - 2 * BORDERPX; |
104 } |
104 } |
105 else /* fallback if th < bh */ |
105 else /* fallback if th - 2 * BORDERPX < bh */ |
106 c->h = wah - 2 * BORDERPX; |
106 c->h = wah - 2 * BORDERPX; |
107 } |
107 } |
108 resize(c, False); |
108 resize(c, False); |
109 i++; |
109 i++; |
110 } |
110 } |
147 } |
147 } |
148 } |
148 } |
149 |
149 |
150 void |
150 void |
151 incnmaster(Arg *arg) { |
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 return; |
154 return; |
154 nmaster += arg->i; |
155 nmaster += arg->i; |
155 if(sel) |
156 if(sel) |
156 arrange(); |
157 arrange(); |
157 else |
158 else |
171 void |
172 void |
172 resizemaster(Arg *arg) { |
173 resizemaster(Arg *arg) { |
173 if(arg->i == 0) |
174 if(arg->i == 0) |
174 master = MASTER; |
175 master = MASTER; |
175 else { |
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 return; |
179 return; |
178 master += arg->i; |
180 master += arg->i; |
179 } |
181 } |
180 arrange(); |
182 arrange(); |
181 } |
183 } |