piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

PXX2 refactoring + Popups refactoring

Browse Source
This commit is contained in:
Bertrand Songis
2019-03-26 13:11:32 +01:00
parent bdd9017589
commit db316af98d
19 changed files with 184 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/common/stdlcd/popups.cpp
+7 -2
View File
@@ -65,7 +65,7 @@ void showMessageBox(const char * title)
const char * runPopupMenu(event_t event)
{
const char * result = NULL;
const char * result = nullptr;
uint8_t display_count = min<uint8_t>(popupMenuItemsCount, MENU_MAX_DISPLAY_LINES);
uint8_t y = LCD_H / 2 - (popupMenuTitle ? 0 : 3) - (display_count * FH / 2);
@@ -149,7 +149,11 @@ const char * runPopupMenu(event_t event)
#endif
case EVT_KEY_BREAK(KEY_ENTER):
result = popupMenuItems[s_menu_item + (popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)];
// no break
popupMenuItemsCount = 0;
s_menu_item = 0;
popupMenuOffset = 0;
popupMenuTitle = nullptr;
break;
#if defined(CASE_EVT_ROTARY_LONG)
CASE_EVT_ROTARY_LONG
@@ -158,6 +162,7 @@ const char * runPopupMenu(event_t event)
#endif
case EVT_KEY_BREAK(KEY_EXIT):
result = STR_EXIT;
popupMenuItemsCount = 0;
s_menu_item = 0;
popupMenuOffset = 0;