diff --git a/radio/src/gui/navigation/navigation_horus.cpp b/radio/src/gui/navigation/navigation_horus.cpp index cf8bcd483..774faea69 100644 --- a/radio/src/gui/navigation/navigation_horus.cpp +++ b/radio/src/gui/navigation/navigation_horus.cpp @@ -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); diff --git a/radio/src/gui/navigation/navigation_x7.cpp b/radio/src/gui/navigation/navigation_x7.cpp index 4ffbf596e..d084b6a60 100644 --- a/radio/src/gui/navigation/navigation_x7.cpp +++ b/radio/src/gui/navigation/navigation_x7.cpp @@ -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 diff --git a/radio/src/gui/navigation/navigation_x9d.cpp b/radio/src/gui/navigation/navigation_x9d.cpp index dcd7b8967..a56ca656a 100644 --- a/radio/src/gui/navigation/navigation_x9d.cpp +++ b/radio/src/gui/navigation/navigation_x9d.cpp @@ -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