From 589398a65ca3d0d1feabe16af844baefacdeff14 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sun, 6 Jun 2021 13:55:43 +0200 Subject: [PATCH] Fixed focus issue with switch choices --- radio/src/gui/colorlcd/sourcechoice.cpp | 3 ++- radio/src/gui/colorlcd/switchchoice.cpp | 2 +- radio/src/thirdparty/libopenui | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/colorlcd/sourcechoice.cpp b/radio/src/gui/colorlcd/sourcechoice.cpp index 69513b890..1e45220ac 100644 --- a/radio/src/gui/colorlcd/sourcechoice.cpp +++ b/radio/src/gui/colorlcd/sourcechoice.cpp @@ -105,6 +105,7 @@ void SourceChoice::fillMenu(Menu * menu, const std::function & fi setValue(val); } this->fillMenu(menu); + menu->setFocusBody(); } }); #endif @@ -140,9 +141,9 @@ void SourceChoice::onEvent(event_t event) #if defined(HARDWARE_TOUCH) bool SourceChoice::onTouchEnd(coord_t, coord_t) { - openMenu(); setFocus(SET_FOCUS_DEFAULT); setEditMode(true); + openMenu(); return true; } #endif diff --git a/radio/src/gui/colorlcd/switchchoice.cpp b/radio/src/gui/colorlcd/switchchoice.cpp index d10c38b11..3e0dcdb08 100644 --- a/radio/src/gui/colorlcd/switchchoice.cpp +++ b/radio/src/gui/colorlcd/switchchoice.cpp @@ -131,9 +131,9 @@ void SwitchChoice::onEvent(event_t event) #if defined(HARDWARE_TOUCH) bool SwitchChoice::onTouchEnd(coord_t, coord_t) { - openMenu(); setFocus(SET_FOCUS_DEFAULT); setEditMode(true); + openMenu(); return true; } #endif diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index 67c2027d3..c7bd04e80 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit 67c2027d32f22762909f419a34171dd3a4b6ee54 +Subproject commit c7bd04e80a7518b966e6435aaaa0951d36125def