forked from speedie/spmenu
make GCC a bit happier
This commit is contained in:
parent
37a48da018
commit
0a3c36fcd9
|
@ -377,7 +377,7 @@ drawmenu(void)
|
||||||
// why have an empty line?
|
// why have an empty line?
|
||||||
if ((hideprompt && hideinput && hidemode && hidematchcount
|
if ((hideprompt && hideinput && hidemode && hidematchcount
|
||||||
#if USEIMAGE
|
#if USEIMAGE
|
||||||
) && !image || hideimage) {
|
) && (!image || hideimage)) {
|
||||||
#else
|
#else
|
||||||
)) {
|
)) {
|
||||||
#endif
|
#endif
|
||||||
|
|
12
libs/img-c.c
12
libs/img-c.c
|
@ -345,19 +345,23 @@ resizetoimageheight(int imageheight)
|
||||||
lines = reallines;
|
lines = reallines;
|
||||||
int wtr = 0;
|
int wtr = 0;
|
||||||
|
|
||||||
if (lines * bh < imageheight + imagegaps * 2)
|
if (lines * bh < imageheight + imagegaps * 2) {
|
||||||
lines = (imageheight + imagegaps * 2) / bh;
|
lines = (imageheight + imagegaps * 2) / bh;
|
||||||
|
}
|
||||||
|
|
||||||
if (hideprompt && hideinput && hidemode && hidematchcount)
|
if (hideprompt && hideinput && hidemode && hidematchcount) {
|
||||||
wtr = bh;
|
wtr = bh;
|
||||||
|
}
|
||||||
|
|
||||||
mh = MAX((lines + 1) * bh, ((lines + 1) * bh) - wtr);
|
mh = MAX((lines + 1) * bh, ((lines + 1) * bh) - wtr);
|
||||||
|
|
||||||
if (mh - bh < imageheight + imagegaps * 2)
|
if (mh - bh < imageheight + imagegaps * 2) {
|
||||||
mh = (imageheight + imagegaps * 2 + bh) - wtr;
|
mh = (imageheight + imagegaps * 2 + bh) - wtr;
|
||||||
|
}
|
||||||
|
|
||||||
if (!win || omh == mh)
|
if (!win || omh == mh) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
XResizeWindow(dpy, win, mw, mh);
|
XResizeWindow(dpy, win, mw, mh);
|
||||||
drw_resize(drw, mw, mh);
|
drw_resize(drw, mw, mh);
|
||||||
|
|
Loading…
Reference in a new issue