ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: move a fragment of common code into the appropriate function

master
Benno Schulenberg 2019-09-27 18:49:39 +02:00
parent 40f6dbc34e
commit cd00d0975e
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/global.c
View File

@ -438,6 +438,9 @@ size_t length_of_list(int menu)
if ((f->menus & menu) && first_sc_for(menu, f->func) != NULL)
i++;
if (i > MAIN_VISIBLE)
return MAIN_VISIBLE;
else
return i;
}

9
src/winio.c
View File

@ -1695,10 +1695,8 @@ int get_mouseinput(int *mouse_y, int *mouse_x, bool allow_shortcuts)
return 0;
}
/* Determine how many shortcuts will be shown. */
/* Determine how many shortcuts are being shown. */
number = length_of_list(currmenu);
if (number > MAIN_VISIBLE)
number = MAIN_VISIBLE;
/* Calculate the width of each non-rightmost shortcut item;
* the rightmost ones will "absorb" any remaining slack. */
@ -2294,12 +2292,9 @@ void bottombars(int menu)
if (ISSET(NO_HELP) || LINES < 5)
return;
/* Determine how many shortcuts there are to show. */
/* Determine how many shortcuts must be shown. */
number = length_of_list(menu);
if (number > MAIN_VISIBLE)
number = MAIN_VISIBLE;
/* Compute the width of each keyname-plus-explanation pair. */
itemwidth = COLS / ((number / 2) + (number % 2));