fix(bw): ignore short/long press of ENTER if cursor on menu line (#5404)
Co-authored-by: philmoz <phil.a.mitchell@gmail.com> Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
This commit is contained in:
co-authored by
philmoz
Peter Feerick
parent
317bb052bc
commit
eea9b85f9f
@@ -288,7 +288,7 @@ void menuModelExposAll(event_t event)
|
||||
}
|
||||
break;
|
||||
case EVT_KEY_BREAK(KEY_ENTER):
|
||||
if ((!s_currCh || (s_copyMode && !s_copyTgtOfs))) {
|
||||
if (sub >= 0 && (!s_currCh || (s_copyMode && !s_copyTgtOfs))) {
|
||||
s_copyMode = (s_copyMode == COPY_MODE ? MOVE_MODE : COPY_MODE);
|
||||
s_copySrcIdx = s_currIdx;
|
||||
s_copySrcCh = chn;
|
||||
@@ -310,7 +310,7 @@ void menuModelExposAll(event_t event)
|
||||
pushMenu(menuModelExpoOne);
|
||||
s_copyMode = 0;
|
||||
}
|
||||
else {
|
||||
else if (sub >= 0) {
|
||||
event = 0;
|
||||
s_copyMode = 0;
|
||||
POPUP_MENU_START(onExposMenu, 6, STR_EDIT, STR_INSERT_BEFORE, STR_INSERT_AFTER, STR_COPY, STR_MOVE, STR_DELETE);
|
||||
|
||||
Reference in New Issue
Block a user