refactor: key handling (#4849)
This commit is contained in:
@@ -111,7 +111,6 @@ static void dispatch_kb_event(Window* w, event_t evt)
|
||||
} else if (key != KEY_ENTER) {
|
||||
w->onEvent(evt);
|
||||
} else if (evt == EVT_KEY_LONG(KEY_ENTER)) {
|
||||
killEvents(KEY_ENTER);
|
||||
lv_event_send(w->getLvObj(), LV_EVENT_LONG_PRESSED, nullptr);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -119,8 +119,6 @@ void GVarNumberEdit::setSuffix(std::string value)
|
||||
void GVarNumberEdit::onEvent(event_t event)
|
||||
{
|
||||
if (event == EVT_KEY_LONG(KEY_ENTER)) {
|
||||
// TODO: check this...
|
||||
// killEvents(event);
|
||||
switchGVarMode();
|
||||
} else {
|
||||
Window::onEvent(event);
|
||||
|
||||
@@ -77,7 +77,7 @@ void ModelMenu::addGoToMonitorsButton()
|
||||
getHeaderWindow(),
|
||||
{LCD_W / 2 + 6, MENU_TITLE_TOP + 1, LCD_W / 2 - 8, MENU_TITLE_HEIGHT - 2},
|
||||
STR_OPEN_CHANNEL_MONITORS, [=]() {
|
||||
pushEvent(EVT_KEY_FIRST(KEY_MODEL));
|
||||
pushEvent(EVT_KEY_BREAK(KEY_MODEL));
|
||||
return 0;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -83,7 +83,6 @@ void TemplatePage::updateInfo()
|
||||
void TemplatePage::onEvent(event_t event)
|
||||
{
|
||||
if (event == EVT_KEY_LONG(KEY_EXIT) || event == EVT_KEY_BREAK(KEY_EXIT)) {
|
||||
killEvents(event);
|
||||
deleteLater();
|
||||
} else {
|
||||
Page::onEvent(event);
|
||||
|
||||
@@ -123,7 +123,6 @@ class SelectFabButton : public ButtonBase
|
||||
#if defined(HARDWARE_KEYS)
|
||||
switch (event) {
|
||||
case EVT_KEY_BREAK(KEY_EXIT):
|
||||
killEvents(event);
|
||||
parent->deleteLater();
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user