From e4fb5e43f4f6fa351aff0c54b2be03a06e5a4919 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sun, 25 Sep 2022 09:10:51 +0200 Subject: [PATCH] fix: disable widget select mode when going full screen --- radio/src/gui/colorlcd/view_main.h | 2 +- radio/src/gui/colorlcd/widget.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/colorlcd/view_main.h b/radio/src/gui/colorlcd/view_main.h index 8992dad4b..88fd1772c 100644 --- a/radio/src/gui/colorlcd/view_main.h +++ b/radio/src/gui/colorlcd/view_main.h @@ -58,6 +58,7 @@ class ViewMain: public Window void enableTopbar(); void disableTopbar(); void updateTopbarVisibility(); + bool enableWidgetSelect(bool enable); // Get the available space in the middle of the screen // (without topbar) @@ -95,7 +96,6 @@ class ViewMain: public Window void setTopbarVisible(float visible); void openMenu(); - bool enableWidgetSelect(bool enable); void refreshWidgetSelectTimer(); static void long_pressed(lv_event_t* e); diff --git a/radio/src/gui/colorlcd/widget.cpp b/radio/src/gui/colorlcd/widget.cpp index 531fc4b31..32444a701 100644 --- a/radio/src/gui/colorlcd/widget.cpp +++ b/radio/src/gui/colorlcd/widget.cpp @@ -140,7 +140,10 @@ void Widget::setFullscreen(bool enable) lv_obj_set_style_bg_opa(lvobj, LV_OPA_MAX, LV_PART_MAIN); setRect(parent->getRect()); fullscreen = true; - ViewMain::instance()->disableTopbar(); + + auto view = ViewMain::instance(); + view->enableWidgetSelect(false); + view->disableTopbar(); bringToTop(); if (!lv_obj_get_group(lvobj)) {