From 1ef26b96b84941ba75b713e94f3927b88b231a70 Mon Sep 17 00:00:00 2001 From: philmoz Date: Tue, 20 Jan 2026 18:27:27 +1100 Subject: [PATCH] fix(color): pressing a key may cause unnecessary page reload (#6996) --- radio/src/gui/colorlcd/setup_menus/pagegroup.cpp | 2 +- radio/src/gui/colorlcd/setup_menus/quick_menu.cpp | 4 ++-- radio/src/gui/colorlcd/setup_menus/quick_menu.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/colorlcd/setup_menus/pagegroup.cpp b/radio/src/gui/colorlcd/setup_menus/pagegroup.cpp index 4ee9097f2..462ab1f58 100644 --- a/radio/src/gui/colorlcd/setup_menus/pagegroup.cpp +++ b/radio/src/gui/colorlcd/setup_menus/pagegroup.cpp @@ -400,7 +400,7 @@ void PageGroupBase::doKeyShortcut(event_t event) if (pg == QM_OPEN_QUICK_MENU) { if (!quickMenu) openMenu(); } else { - if (QuickMenu::pageIcon(pg) == icon) { + if (QuickMenu::subMenuIcon(pg) == icon) { setCurrentTab(QuickMenu::pageIndex(pg)); } else { onCancel(); diff --git a/radio/src/gui/colorlcd/setup_menus/quick_menu.cpp b/radio/src/gui/colorlcd/setup_menus/quick_menu.cpp index adb223e68..addbb2aa0 100644 --- a/radio/src/gui/colorlcd/setup_menus/quick_menu.cpp +++ b/radio/src/gui/colorlcd/setup_menus/quick_menu.cpp @@ -366,7 +366,7 @@ void QuickMenu::openPage(QMPage page) } } -EdgeTxIcon QuickMenu::pageIcon(QMPage page) +EdgeTxIcon QuickMenu::subMenuIcon(QMPage page) { for (int i = FIRST_SEARCH_IDX; qmTopItems[i].icon != EDGETX_ICONS_COUNT; i += 1) { if (qmTopItems[i].pageAction == QM_ACTION) { @@ -377,7 +377,7 @@ EdgeTxIcon QuickMenu::pageIcon(QMPage page) PageDef* sub = qmTopItems[i].subMenuItems; for (int j = 0; sub[j].icon != EDGETX_ICONS_COUNT; j += 1) { if (sub[j].qmPage == page) { - return sub[j].icon; + return qmTopItems[i].icon; } } } diff --git a/radio/src/gui/colorlcd/setup_menus/quick_menu.h b/radio/src/gui/colorlcd/setup_menus/quick_menu.h index 61b78d474..1c5bcd288 100644 --- a/radio/src/gui/colorlcd/setup_menus/quick_menu.h +++ b/radio/src/gui/colorlcd/setup_menus/quick_menu.h @@ -70,7 +70,7 @@ class QuickMenu : public NavWindow static void shutdownQuickMenu(); static void selected(); static void openPage(QMPage page); - static EdgeTxIcon pageIcon(QMPage page); + static EdgeTxIcon subMenuIcon(QMPage page); static int pageIndex(QMPage page); static std::vector menuPageNames(bool forFavorites);