fix(color): Prevent multiple instances of the main menu popup (#3067)
This commit is contained in:
@@ -135,6 +135,11 @@ void ViewMainMenu::deleteLater(bool detach, bool trash)
|
||||
Window::deleteLater(detach, trash);
|
||||
}
|
||||
|
||||
void ViewMainMenu::onClicked()
|
||||
{
|
||||
deleteLater();
|
||||
}
|
||||
|
||||
void ViewMainMenu::onCancel()
|
||||
{
|
||||
deleteLater();
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user