From 92e8baf91637205304970a2fbd423eed1aad6abb Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sun, 6 Jun 2021 16:44:36 +0200 Subject: [PATCH] Use autoswitch in SourceChoice as well --- radio/src/fonts/extra_16px.png | Bin 14118 -> 14096 bytes radio/src/fonts/extra_17px.png | Bin 14118 -> 14096 bytes radio/src/gui/colorlcd/sourcechoice.cpp | 15 ++++++++++++--- radio/src/gui/colorlcd/switchchoice.cpp | 24 ++++++++++++------------ 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/radio/src/fonts/extra_16px.png b/radio/src/fonts/extra_16px.png index ae21c840329d116e259274919326993a88adb402..6bfcf4f00232717fda7e50c7eae229bcf7271c25 100644 GIT binary patch delta 8870 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 delta 8885 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 delta 8885 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 & fi int current = 0; menu->removeLines(); - for (int i = vmin; i <= vmax; ++i) { if (filter && !filter(i)) continue; if (isValueAvailable && !isValueAvailable(i)) continue; @@ -96,7 +95,7 @@ void SourceChoice::fillMenu(Menu * menu, const std::function & fi #if defined(AUTOSOURCE) menu->setWaitHandler([=]() { - int8_t val = getMovedSource(0); + int16_t val = getMovedSource(0); if (val) { if (filter && filter(val)) { return; @@ -105,7 +104,17 @@ void SourceChoice::fillMenu(Menu * menu, const std::function & fi setValue(val); } this->fillMenu(menu); - menu->setFocusBody(); + } + else { + swsrc_t swtch = getMovedSwitch(); + if (swtch) { + div_t info = switchInfo(swtch); + val = info.quot + MIXSRC_FIRST_SWITCH; + if (val && (!filter || !filter(val))) { + if (setValue) setValue(val); + this->fillMenu(menu); + } + } } }); #endif diff --git a/radio/src/gui/colorlcd/switchchoice.cpp b/radio/src/gui/colorlcd/switchchoice.cpp index 3e0dcdb08..6f90e8878 100644 --- a/radio/src/gui/colorlcd/switchchoice.cpp +++ b/radio/src/gui/colorlcd/switchchoice.cpp @@ -77,18 +77,6 @@ void SwitchChoice::fillMenu(Menu * menu, std::function filter) if (current >= 0) { menu->select(current); } -} - -void SwitchChoice::openMenu() -{ - auto menu = new Menu(this); - fillMenu(menu); - - menu->setToolbar(new SwitchChoiceMenuToolbar(this, menu)); - menu->setCloseHandler([=]() { - editMode = false; - setFocus(SET_FOCUS_DEFAULT); - }); #if defined(AUTOSWITCH) menu->setWaitHandler([=]() { @@ -112,6 +100,18 @@ void SwitchChoice::openMenu() #endif } +void SwitchChoice::openMenu() +{ + auto menu = new Menu(this); + fillMenu(menu); + + menu->setToolbar(new SwitchChoiceMenuToolbar(this, menu)); + menu->setCloseHandler([=]() { + editMode = false; + setFocus(SET_FOCUS_DEFAULT); + }); +} + #if defined(HARDWARE_KEYS) void SwitchChoice::onEvent(event_t event) {