From d372cfa01014c51eddb452330a333ff0a0ad6d2a Mon Sep 17 00:00:00 2001 From: eshifri <46511024+eshifri@users.noreply.github.com> Date: Tue, 25 Oct 2022 18:53:03 -0700 Subject: [PATCH] fix(color): Disable invalid PG_UP and PG_DN handling on widget setup screen (#2630) --- radio/src/gui/colorlcd/widgets_setup.cpp | 9 +++++++++ radio/src/gui/colorlcd/widgets_setup.h | 1 + 2 files changed, 10 insertions(+) diff --git a/radio/src/gui/colorlcd/widgets_setup.cpp b/radio/src/gui/colorlcd/widgets_setup.cpp index ab77f25db..68e98f338 100644 --- a/radio/src/gui/colorlcd/widgets_setup.cpp +++ b/radio/src/gui/colorlcd/widgets_setup.cpp @@ -134,3 +134,12 @@ void SetupWidgetsPage::deleteLater(bool detach, bool trash) storageDirty(EE_MODEL); } + +void SetupWidgetsPage::onEvent(event_t event) +{ + if (event == EVT_KEY_FIRST(KEY_PGUP) || event == EVT_KEY_FIRST(KEY_PGDN)) { + killEvents(event); + } else { + FormWindow::onEvent(event); + } +} diff --git a/radio/src/gui/colorlcd/widgets_setup.h b/radio/src/gui/colorlcd/widgets_setup.h index 91f12dadf..3ffed7fcf 100644 --- a/radio/src/gui/colorlcd/widgets_setup.h +++ b/radio/src/gui/colorlcd/widgets_setup.h @@ -46,6 +46,7 @@ class SetupWidgetsPage : public FormWindow protected: uint8_t customScreenIdx; unsigned savedView = 0; + void onEvent(event_t event) override; }; class SetupWidgetsPageSlot : public Button