ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2025-12-06 03:31:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

ui: remove close menu item

Browse source
This commit is contained in:
TT 2019-10-08 23:59:49 +09:00
parent e3a10a7868
commit 4a9dee96a4
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ui.c
View file

@ -1054,7 +1054,6 @@ const menuitem_t menu_top[] = {
{ MT_SUBMENU, "CAL", menu_cal }, { MT_SUBMENU, "CAL", menu_cal },
{ MT_SUBMENU, "RECALL", menu_recall }, { MT_SUBMENU, "RECALL", menu_recall },
{ MT_SUBMENU, "CONFIG", menu_config }, { MT_SUBMENU, "CONFIG", menu_config },
{ MT_CLOSE, "CLOSE", NULL },
{ MT_NONE, NULL, NULL } // sentinel { MT_NONE, NULL, NULL } // sentinel
}; };
@ -1655,13 +1654,16 @@ ui_process_menu(void)
menu_invoke(selection); menu_invoke(selection);
} else { } else {
do { do {
if (status & EVT_UP if (status & EVT_UP) {
&& menu_stack[menu_current_level][selection+1].type != MT_NONE) { // close menu if next item is sentinel
if (menu_stack[menu_current_level][selection+1].type == MT_NONE)
goto menuclose;
selection++; selection++;
draw_menu(); draw_menu();
} }
if (status & EVT_DOWN if (status & EVT_DOWN) {
&& selection > 0) { if (selection == 0)
goto menuclose;
selection--; selection--;
draw_menu(); draw_menu();
} }
@ -1669,6 +1671,10 @@ ui_process_menu(void)
} while (status != 0); } while (status != 0);
} }
} }
return;
menuclose:
ui_mode_normal();
} }
static int static int