refactor: key handling (#4849)

This commit is contained in:
philmoz
2024-05-27 18:33:53 +10:00
committed by GitHub
parent b8a0038c68
commit e807ccbebf
101 changed files with 380 additions and 578 deletions
+1 -6
View File
@@ -439,12 +439,7 @@ void Menu::onEvent(event_t event)
{
#if defined(HARDWARE_KEYS)
if (toolbar && (event == EVT_KEY_BREAK(KEY_PAGEDN) ||
#if defined(KEYS_GPIO_REG_PAGEUP)
event == EVT_KEY_BREAK(KEY_PAGEUP)
#else
event == EVT_KEY_LONG(KEY_PAGEDN)
#endif
)) {
event == EVT_KEY_BREAK(KEY_PAGEUP))) {
toolbar->onEvent(event);
}
#endif
-5
View File
@@ -98,12 +98,7 @@ void MenuToolbar::onEvent(event_t event)
if (event == EVT_KEY_BREAK(KEY_PAGEDN)) {
lv_group_focus_next(group);
}
#if defined(KEYS_GPIO_REG_PAGEUP)
else if (event == EVT_KEY_BREAK(KEY_PAGEUP)) {
#else
else if (event == EVT_KEY_LONG(KEY_PAGEDN)) {
killEvents(event);
#endif
lv_group_focus_prev(group);
}
-22
View File
@@ -400,7 +400,6 @@ void NavWindow::onEvent(event_t event)
break;
case EVT_KEY_LONG(KEY_MODEL):
killEvents(KEY_MODEL);
onLongPressMDL();
break;
@@ -409,7 +408,6 @@ void NavWindow::onEvent(event_t event)
break;
case EVT_KEY_LONG(KEY_SYS):
killEvents(event);
onLongPressSYS();
break;
@@ -418,7 +416,6 @@ void NavWindow::onEvent(event_t event)
break;
case EVT_KEY_LONG(KEY_TELE):
killEvents(event);
onLongPressTELE();
break;
@@ -426,28 +423,9 @@ void NavWindow::onEvent(event_t event)
onPressPGDN();
break;
#if defined(KEYS_GPIO_REG_PAGEUP) || defined(USE_HATS_AS_KEYS)
// Radios with both PGUP and PGDN buttons
case EVT_KEY_BREAK(KEY_PAGEUP):
onPressPGUP();
break;
case EVT_KEY_LONG(KEY_PAGEDN):
killEvents(event);
onLongPressPGDN();
break;
case EVT_KEY_LONG(KEY_PAGEUP):
killEvents(event);
onLongPressPGUP();
break;
#else
// Radios witb only a single PGUP/DN button
case EVT_KEY_LONG(KEY_PAGEDN):
killEvents(event);
onPressPGUP();
break;
#endif
#endif
default: