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

Re #2469: part1: Menu system renaming of variables and refactoring (ported #3087 from master commits 3186a5d99..94d8b8b0e8d)

Browse source
This commit is contained in:
Damjan Adamic 2015-11-26 18:01:56 +01:00
parent ab99740e1b
commit 51b8f9b054
96 changed files with 2150 additions and 2167 deletions
Download patch file Download diff file Expand all files Collapse all files

34
radio/src/main_arm.cpp
View file

@ -152,13 +152,13 @@ void guiMain(evt_t evt)
if (!standaloneScriptWasRun) {
while (1) {
// normal GUI from menus
const char * warn = s_warning;
uint8_t menu = s_menu_count;
const char * warn = warningText;
uint8_t menu = popupMenuNoItems;
static bool popupDisplayed = false;
if (warn || menu) {
if (popupDisplayed == false) {
g_menuStack[g_menuStackPtr](EVT_REFRESH);
menuHandlers[menuLevel](EVT_REFRESH);
lcdDrawBlackOverlay();
TIME_MEASURE_START(storebackup);
lcdStoreBackupBuffer();
@ -168,9 +168,9 @@ void guiMain(evt_t evt)
lcdRestoreBackupBuffer();
if (warn) DISPLAY_WARNING(evt);
if (menu) {
const char * result = displayMenu(evt);
const char * result = displayPopupMenu(evt);
if (result) {
menuHandler(result);
popupMenuHandler(result);
evt = EVT_REFRESH;
continue;
}
@ -186,18 +186,18 @@ void guiMain(evt_t evt)
}
popupDisplayed = false;
}
refreshNeeded = g_menuStack[g_menuStackPtr](evt);
refreshNeeded = menuHandlers[menuLevel](evt);
}
if (menuEvent == EVT_ENTRY) {
m_posVert = -1;
m_posHorz = 0;
menuVerticalPosition = -1;
menuHorizontalPosition = 0;
evt = menuEvent;
menuEvent = 0;
}
else if (menuEvent == EVT_ENTRY_UP) {
m_posVert = g_menuPos[g_menuStackPtr];
m_posHorz = 0;
menuVerticalPosition = menuVerticalPositions[menuLevel];
menuHorizontalPosition = 0;
evt = menuEvent;
menuEvent = 0;
}
@ -254,22 +254,22 @@ void guiMain(evt_t evt)
lcdClear();
// normal GUI from menus
const char * warn = s_warning;
uint8_t menu = s_menu_count;
const char * warn = warningText;
uint8_t menu = popupMenuNoItems;
if (menuEvent) {
m_posVert = menuEvent == EVT_ENTRY_UP ? g_menuPos[g_menuStackPtr] : 0;
m_posHorz = 0;
menuVerticalPosition = menuEvent == EVT_ENTRY_UP ? menuVerticalPositions[menuLevel] : 0;
menuHorizontalPosition = 0;
evt = menuEvent;
menuEvent = 0;
AUDIO_MENUS();
}
g_menuStack[g_menuStackPtr]((warn || menu) ? 0 : evt);
menuHandlers[menuLevel]((warn || menu) ? 0 : evt);
if (warn) DISPLAY_WARNING(evt);
if (menu) {
const char * result = displayMenu(evt);
const char * result = displayPopupMenu(evt);
if (result) {
menuHandler(result);
popupMenuHandler(result);
}
}