Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

Popups refactoring

Browse source
This commit is contained in:
Bertrand Songis 2019-05-03 23:26:17 +02:00
parent 8376e1b16b
commit 7d4adc1afe
8 changed files with 117 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

10
radio/src/main.cpp
View file

@ -438,24 +438,20 @@ void guiMain(event_t evt)
menuEvent = 0;
}
handleGui(isEventCaughtByPopup() ? 0 : evt);
if (warningText) {
// show warning on top of the normal menus
handleGui(0); // suppress events, they are handled by the warning
DISPLAY_WARNING(evt);
}
else if (popupMenuItemsCount > 0) {
// popup menu is active display it on top of normal menus
handleGui(0); // suppress events, they are handled by the popup
// show popup menu on top of the normal menus
const char * result = runPopupMenu(evt);
if (result) {
TRACE("popupMenuHandler(%s)", result);
popupMenuHandler(result);
}
}
else {
// normal menus
handleGui(evt);
}
lcdRefresh();
}