blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-10 01:29:05 -04:00
Code Issues Projects Releases Wiki Activity

ncmenu: don't allow disabled entries to be selected #1057

Browse Source
This commit is contained in:
nick black 2020-10-14 02:10:45 -04:00 committed by Nick Black
parent e9b5ea61f7
commit ca0907a628
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/menu.c
View File

@ -490,11 +490,12 @@ int ncmenu_nextitem(ncmenu* n){
return -1;
}
}
ncmenu_int_section* sec = &n->sections[n->unrolledsection];
do{
if(++n->sections[n->unrolledsection].itemselected == n->sections[n->unrolledsection].itemcount){
n->sections[n->unrolledsection].itemselected = 0;
if(++sec->itemselected == sec->itemcount){
sec->itemselected = 0;
}
}while(!n->sections[n->unrolledsection].items[n->sections[n->unrolledsection].itemselected].desc);
}while(!sec->items[sec->itemselected].desc || sec->items[sec->itemselected].disabled);
return ncmenu_unroll(n, n->unrolledsection);
}
@ -504,11 +505,12 @@ int ncmenu_previtem(ncmenu* n){
return -1;
}
}
ncmenu_int_section* sec = &n->sections[n->unrolledsection];
do{
if(n->sections[n->unrolledsection].itemselected-- == 0){
n->sections[n->unrolledsection].itemselected = n->sections[n->unrolledsection].itemcount - 1;
if(sec->itemselected-- == 0){
sec->itemselected = sec->itemcount - 1;
}
}while(!n->sections[n->unrolledsection].items[n->sections[n->unrolledsection].itemselected].desc);
}while(!sec->items[sec->itemselected].desc || sec->items[sec->itemselected].disabled);
return ncmenu_unroll(n, n->unrolledsection);
}