Fixed focus issue with switch choices

radio/src/gui/colorlcd/sourcechoice.cpp

@@ -105,6 +105,7 @@ void SourceChoice::fillMenu(Menu * menu, const std::function<bool(int16_t)> & 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

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