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

Prevent page changes during value editing (#6124)

Browse Source
This commit is contained in:
Andre Bernet
2018-09-18 10:54:54 +02:00
committed by Kilrah
parent 1257b50bf4
commit e85ad43821
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/navigation/navigation_horus.cpp
+6
View File
@@ -357,6 +357,9 @@ bool check(event_t event, uint8_t curr, const MenuHandlerFunc * menuTab, uint8_t
#elif defined(PCBX10)
case EVT_KEY_BREAK(KEY_PGDN):
#endif
if (s_editMode>0)
break;
if (++cc == menuTabSize)
cc = 0;
break;
@@ -365,6 +368,9 @@ bool check(event_t event, uint8_t curr, const MenuHandlerFunc * menuTab, uint8_t
#if defined(PCBX10)
case EVT_KEY_LONG(KEY_PGDN):
#endif
if (s_editMode>0)
break;
if (cc-- == 0)
cc = menuTabSize-1;
killEvents(event);
radio/src/gui/navigation/navigation_x7.cpp
+6
View File
@@ -257,6 +257,9 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc * menuTab, uint8_t
int cc = curr;
switch (event) {
case EVT_KEY_LONG(KEY_PAGE):
if (s_editMode>0)
break;
if (curr > 0)
cc = curr - 1;
else
@@ -265,6 +268,9 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc * menuTab, uint8_t
break;
case EVT_KEY_BREAK(KEY_PAGE):
if (s_editMode>0)
break;
if (curr < (menuTabSize-1))
cc = curr + 1;
else
radio/src/gui/navigation/navigation_x9d.cpp
+6
View File
@@ -361,6 +361,9 @@ void check(const char * name, event_t event, uint8_t curr, const MenuHandlerFunc
break;
case EVT_KEY_LONG(KEY_PAGE):
if (s_editMode>0)
break;
if (curr > 0)
cc = curr - 1;
else
@@ -369,6 +372,9 @@ void check(const char * name, event_t event, uint8_t curr, const MenuHandlerFunc
break;
case EVT_KEY_BREAK(KEY_PAGE):
if (s_editMode>0)
break;
if (curr < (menuTabSize-1))
cc = curr + 1;
else