fix(color): Prevent multiple instances of the main menu popup (#3067)

EdgeTX · Jan 24, 2023 · 80f3cbe · 80f3cbe
1 parent 2d534a8
commit 80f3cbe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/radio/src/gui/colorlcd/view_main_menu.cpp b/radio/src/gui/colorlcd/view_main_menu.cpp
@@ -135,6 +135,11 @@ void ViewMainMenu::deleteLater(bool detach, bool trash)
   Window::deleteLater(detach, trash);
 }
 
+void ViewMainMenu::onClicked()
+{
+  deleteLater();
+}
+
 void ViewMainMenu::onCancel()
 {
   deleteLater();

diff --git a/radio/src/gui/colorlcd/view_main_menu.h b/radio/src/gui/colorlcd/view_main_menu.h
@@ -29,24 +29,10 @@ class ViewMainMenu : public Window
   ViewMainMenu(Window* parent);
 
   void onCancel() override;
+  void onClicked() override;
   void paint(BitmapBuffer* dc) override;
   void deleteLater(bool detach = true, bool trash = true) override;
 
-#if defined(HARDWARE_TOUCH)
-  bool onTouchStart(coord_t /*x*/, coord_t /*y*/) override { return true; }
-  bool onTouchEnd(coord_t x, coord_t y) override
-  {
-    deleteLater();
-    return true;
-  }
-  bool onTouchSlide(coord_t x, coord_t y, coord_t startX, coord_t startY,
-                    coord_t slideX, coord_t slideY) override
-  {
-    Window::onTouchSlide(x, y, startX, startY, slideX, slideY);
-    return true;
-  }
-#endif
-
  protected:
   rect_t carouselRect;
 };