Lucas-mother3/spmenu
1
0
Fork 0
forked from speedie/spmenu
Code Pull requests Activity

Make sure number of lines/menu height cannot exceed monitor height

Browse source
This commit is contained in:
speedie 2023-07-14 01:16:35 +02:00
parent 6ec63436d7
commit 48e3db316b
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/x11/init.c
View file

@ -64,6 +64,8 @@ void setupdisplay_x11(void) {
mo.output_height = wa.height; mo.output_height = wa.height;
} }
get_mh();
if (menuposition == 2) { // centered if (menuposition == 2) { // centered
sp.mw = MIN(MAX(max_textw() + sp.promptw, minwidth), mo.output_width); sp.mw = MIN(MAX(max_textw() + sp.promptw, minwidth), mo.output_width);
x = (mo.output_width - sp.mw) / 2 + xpos; x = (mo.output_width - sp.mw) / 2 + xpos;

12
spmenu.c
View file

@ -501,12 +501,24 @@ void get_width(void) {
} }
void get_mh(void) { void get_mh(void) {
int epad;
sp.mh = (lines + 1) * sp.bh; sp.mh = (lines + 1) * sp.bh;
sp.mh += 2 * menumarginv; sp.mh += 2 * menumarginv;
if ((hideprompt && hideinput && hidemode && hidematchcount && hidecaps) && lines) { if ((hideprompt && hideinput && hidemode && hidematchcount && hidecaps) && lines) {
sp.mh -= sp.bh; sp.mh -= sp.bh;
} }
epad = 2 * menupaddingv;
if (mo.output_height && !xpos && !ypos) {
sp.mh = MIN(sp.mh, mo.output_height - epad);
if (sp.mh == mo.output_height - epad) {
lines = ((mo.output_height - epad) / sp.bh) - 1;
}
}
} }
void set_mode(void) { void set_mode(void) {