applied Eric Mertens patch to mainstream dwm, however this needs testing
This commit is contained in:
parent
5a04edecb1
commit
04de5720e6
63
dwm.c
63
dwm.c
@ -1036,39 +1036,42 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
|
|||||||
XWindowChanges wc;
|
XWindowChanges wc;
|
||||||
|
|
||||||
if(sizehints) {
|
if(sizehints) {
|
||||||
if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) {
|
/* set minimum possible */
|
||||||
dx = (double)(w - c->basew);
|
if (w < 1)
|
||||||
dy = (double)(h - c->baseh);
|
w = 1;
|
||||||
min = (double)(c->minax) / (double)(c->minay);
|
if (h < 1)
|
||||||
max = (double)(c->maxax) / (double)(c->maxay);
|
h = 1;
|
||||||
ratio = dx / dy;
|
|
||||||
if(max > 0 && min > 0 && ratio > 0) {
|
/* temporarily remove base dimensions */
|
||||||
if(ratio < min) {
|
w -= c->basew;
|
||||||
dy = (dx * min + dy) / (min * min + 1);
|
h -= c->baseh;
|
||||||
dx = dy * min;
|
|
||||||
w = (int)dx + c->basew;
|
/* adjust for aspect limits */
|
||||||
h = (int)dy + c->baseh;
|
if (c->minay > 0 && c->maxay > 0 && c->minax > 0 && c->maxax > 0) {
|
||||||
}
|
if (w * c->maxay > h * c->maxax)
|
||||||
else if(ratio > max) {
|
w = h * c->maxax / c->maxay;
|
||||||
dy = (dx * min + dy) / (max * max + 1);
|
else if (w * c->minay < h * c->minax)
|
||||||
dx = dy * min;
|
h = w * c->minay / c->minax;
|
||||||
w = (int)dx + c->basew;
|
|
||||||
h = (int)dy + c->baseh;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(c->minw && w < c->minw)
|
|
||||||
w = c->minw;
|
/* adjust for increment value */
|
||||||
if(c->minh && h < c->minh)
|
|
||||||
h = c->minh;
|
|
||||||
if(c->maxw && w > c->maxw)
|
|
||||||
w = c->maxw;
|
|
||||||
if(c->maxh && h > c->maxh)
|
|
||||||
h = c->maxh;
|
|
||||||
if(c->incw)
|
if(c->incw)
|
||||||
w -= (w - c->basew) % c->incw;
|
w -= w % c->incw;
|
||||||
if(c->inch)
|
if(c->inch)
|
||||||
h -= (h - c->baseh) % c->inch;
|
h -= h % c->inch;
|
||||||
|
|
||||||
|
/* restore base dimensions */
|
||||||
|
w += c->basew;
|
||||||
|
h += c->baseh;
|
||||||
|
|
||||||
|
if(c->minw > 0 && w < c->minw)
|
||||||
|
w = c->minw;
|
||||||
|
if(c->minh > 0 && h < c->minh)
|
||||||
|
h = c->minh;
|
||||||
|
if(c->maxw > 0 && w > c->maxw)
|
||||||
|
w = c->maxw;
|
||||||
|
if(c->maxh > 0 && h > c->maxh)
|
||||||
|
h = c->maxh;
|
||||||
}
|
}
|
||||||
if(w <= 0 || h <= 0)
|
if(w <= 0 || h <= 0)
|
||||||
return;
|
return;
|
||||||
|
Loading…
Reference in New Issue
Block a user