Fixed focus issue with switch choices

This commit is contained in:
Raphael Coeffic
2021-06-07 11:08:36 +02:00
committed by Raphael Coeffic
parent 162ffdb148
commit 589398a65c
3 changed files with 4 additions and 3 deletions
+2 -1
View File
@@ -105,6 +105,7 @@ void SourceChoice::fillMenu(Menu * menu, const std::function<bool(int16_t)> & fi
setValue(val); setValue(val);
} }
this->fillMenu(menu); this->fillMenu(menu);
menu->setFocusBody();
} }
}); });
#endif #endif
@@ -140,9 +141,9 @@ void SourceChoice::onEvent(event_t event)
#if defined(HARDWARE_TOUCH) #if defined(HARDWARE_TOUCH)
bool SourceChoice::onTouchEnd(coord_t, coord_t) bool SourceChoice::onTouchEnd(coord_t, coord_t)
{ {
openMenu();
setFocus(SET_FOCUS_DEFAULT); setFocus(SET_FOCUS_DEFAULT);
setEditMode(true); setEditMode(true);
openMenu();
return true; return true;
} }
#endif #endif
+1 -1
View File
@@ -131,9 +131,9 @@ void SwitchChoice::onEvent(event_t event)
#if defined(HARDWARE_TOUCH) #if defined(HARDWARE_TOUCH)
bool SwitchChoice::onTouchEnd(coord_t, coord_t) bool SwitchChoice::onTouchEnd(coord_t, coord_t)
{ {
openMenu();
setFocus(SET_FOCUS_DEFAULT); setFocus(SET_FOCUS_DEFAULT);
setEditMode(true); setEditMode(true);
openMenu();
return true; return true;
} }
#endif #endif