From c3660ab931a3cb5a2d0cc099366ced1a1444e51b Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sat, 17 Sep 2022 09:40:13 +0200 Subject: [PATCH] fix(color): fullscreen widget exit when entered via keys Related #2182 --- radio/src/gui/colorlcd/widget.cpp | 5 +++++ radio/src/gui/colorlcd/widget.h | 1 + 2 files changed, 6 insertions(+) diff --git a/radio/src/gui/colorlcd/widget.cpp b/radio/src/gui/colorlcd/widget.cpp index ebb617e06..365e8e6a1 100644 --- a/radio/src/gui/colorlcd/widget.cpp +++ b/radio/src/gui/colorlcd/widget.cpp @@ -86,6 +86,11 @@ void Widget::onEvent(event_t event) } #endif +void Widget::onCancel() +{ + if (!fullscreen) Button::onCancel(); +} + void Widget::update() { auto container = dynamic_cast(parent); diff --git a/radio/src/gui/colorlcd/widget.h b/radio/src/gui/colorlcd/widget.h index 8c3543042..a2763a4ec 100644 --- a/radio/src/gui/colorlcd/widget.h +++ b/radio/src/gui/colorlcd/widget.h @@ -108,6 +108,7 @@ class Widget : public Button uint32_t focusGainedTS = 0; bool fullscreen = false; + void onCancel() override; void onLongPress() override; virtual void onFullscreen(bool enable) {} };