fix(color): rotary encoder may not work after editing a telemetry sensor (#6852)

This commit is contained in:
philmoz
2025-12-05 11:17:59 +10:00
committed by GitHub
parent 2e14fb4141
commit 12801409da
17 changed files with 64 additions and 78 deletions
@@ -45,7 +45,7 @@ FullScreenDialog::FullScreenDialog(
// In case alert raised while splash screen is showing. // In case alert raised while splash screen is showing.
cancelSplash(); cancelSplash();
Layer::push(this); pushLayer();
bringToTop(); bringToTop();
@@ -156,7 +156,6 @@ void FullScreenDialog::deleteLater(bool detach, bool trash)
running = false; running = false;
} else { } else {
Window::deleteLater(detach, trash); Window::deleteLater(detach, trash);
Layer::pop(this);
} }
} }
+13 -9
View File
@@ -20,7 +20,7 @@
std::list<Layer> Layer::stack; std::list<Layer> Layer::stack;
Layer::Layer(Window* w, lv_group_t* g) : window(w), group(g) {} Layer::Layer(Window* w, lv_group_t* g, lv_group_t* pg) : window(w), group(g), prevGroup(pg) {}
Layer::~Layer() { lv_group_del(group); } Layer::~Layer() { lv_group_del(group); }
void _assign_lv_group(lv_group_t* g) void _assign_lv_group(lv_group_t* g)
@@ -37,12 +37,15 @@ void _assign_lv_group(lv_group_t* g)
void Layer::push(Window* w) void Layer::push(Window* w)
{ {
// save prev group
auto pg = lv_group_get_default();
// create a new group // create a new group
auto g = lv_group_create(); auto g = lv_group_create();
_assign_lv_group(g); _assign_lv_group(g);
// and store // and store
stack.emplace_back(w, g); stack.emplace_back(w, g, pg);
} }
void Layer::pop(Window* w) void Layer::pop(Window* w)
@@ -50,6 +53,14 @@ void Layer::pop(Window* w)
if (stack.empty()) return; if (stack.empty()) return;
if (back() == w) { if (back() == w) {
lv_group_t* prevGroup = stack.back().prevGroup;
if (prevGroup) {
_assign_lv_group(prevGroup);
} else if (!stack.empty()) {
_assign_lv_group(stack.back().group);
} else {
lv_group_set_default(NULL);
}
stack.pop_back(); stack.pop_back();
} else { } else {
for (auto layer = stack.crbegin(); layer != stack.crend(); layer++) { for (auto layer = stack.crbegin(); layer != stack.crend(); layer++) {
@@ -60,13 +71,6 @@ void Layer::pop(Window* w)
} }
return; return;
} }
if (!stack.empty()) {
lv_group_t* g = stack.back().group;
_assign_lv_group(g);
} else {
lv_group_set_default(NULL);
}
} }
Window* Layer::back() Window* Layer::back()
+2 -1
View File
@@ -26,9 +26,10 @@ class Layer
Window* window; Window* window;
lv_group_t* group; lv_group_t* group;
lv_group_t* prevGroup;
public: public:
explicit Layer(Window* w, lv_group_t* g); explicit Layer(Window* w, lv_group_t* g, lv_group_t* pg);
~Layer(); ~Layer();
static void push(Window* window); static void push(Window* window);
@@ -51,14 +51,7 @@ ModalWindow::ModalWindow(bool closeWhenClickOutside) :
closeWhenClickOutside(closeWhenClickOutside) closeWhenClickOutside(closeWhenClickOutside)
{ {
setWindowFlag(OPAQUE); setWindowFlag(OPAQUE);
Layer::push(this); pushLayer();
}
void ModalWindow::deleteLater(bool detach, bool trash)
{
if (_deleted) return;
Window::deleteLater(detach, trash);
Layer::pop(this);
} }
void ModalWindow::onClicked() void ModalWindow::onClicked()
@@ -35,7 +35,6 @@ class ModalWindow : public Window
} }
void onClicked() override; void onClicked() override;
void deleteLater(bool detach = true, bool trash = true) override;
protected: protected:
bool closeWhenClickOutside; bool closeWhenClickOutside;
+1 -10
View File
@@ -100,20 +100,11 @@ Page::Page(EdgeTxIcon icon, PaddingSize padding, bool pauseRefresh) :
LV_PART_MAIN); LV_PART_MAIN);
etx_scrollbar(body->getLvObj()); etx_scrollbar(body->getLvObj());
Layer::back()->hide(); pushLayer(true);
Layer::push(this);
body->padAll(padding); body->padAll(padding);
} }
void Page::deleteLater(bool detach, bool trash)
{
NavWindow::deleteLater(detach, trash);
Layer::pop(this);
Layer::back()->show();
}
void Page::openMenu() void Page::openMenu()
{ {
PageGroup* p = (PageGroup*)Layer::getPageGroup(); PageGroup* p = (PageGroup*)Layer::getPageGroup();
-2
View File
@@ -54,8 +54,6 @@ class Page : public NavWindow
void onCancel() override; void onCancel() override;
void onClicked() override; void onClicked() override;
void deleteLater(bool detach = true, bool trash = true) override;
void enableRefresh(); void enableRefresh();
void openMenu(); void openMenu();
+30 -10
View File
@@ -22,6 +22,7 @@
#include "form.h" #include "form.h"
#include "static.h" #include "static.h"
#include "etx_lv_theme.h" #include "etx_lv_theme.h"
#include "layer.h"
std::list<Window *> Window::trash; std::list<Window *> Window::trash;
bool Window::_longPressed = false; bool Window::_longPressed = false;
@@ -196,6 +197,26 @@ std::string Window::getWindowDebugString(const char *name) const
} }
#endif #endif
void Window::pushLayer(bool hideParent)
{
if (!layerCreated) {
parentHidden = hideParent;
layerCreated = true;
if (parentHidden) Layer::back()->hide();
Layer::push(this);
}
}
void Window::popLayer()
{
if (layerCreated) {
Layer::pop(this);
if (parentHidden) Layer::back()->show();
layerCreated = false;
parentHidden = false;
}
}
Window *Window::getFullScreenWindow() Window *Window::getFullScreenWindow()
{ {
if (width() == LCD_W && height() == LCD_H) return this; if (width() == LCD_W && height() == LCD_H) return this;
@@ -237,26 +258,25 @@ void Window::detach()
void Window::deleteLater(bool detach, bool trash) void Window::deleteLater(bool detach, bool trash)
{ {
if (_deleted) return; if (_deleted) return;
TRACE_WINDOWS("Delete %p %s", this, getWindowDebugString().c_str());
_deleted = true; _deleted = true;
if (closeHandler) { TRACE_WINDOWS("Delete %p %s", this, getWindowDebugString().c_str());
closeHandler();
}
if (detach) if (detach)
this->detach(); this->detach();
else else
parent = nullptr; parent = nullptr;
if (trash) {
Window::trash.push_back(this);
}
deleteChildren(); deleteChildren();
popLayer();
if (closeHandler)
closeHandler();
if (trash)
Window::trash.push_back(this);
if (lvobj != nullptr) { if (lvobj != nullptr) {
auto obj = lvobj; auto obj = lvobj;
lvobj = nullptr; lvobj = nullptr;
+5
View File
@@ -192,6 +192,9 @@ class Window
void disableForcedScroll() { noForcedScroll = true; } void disableForcedScroll() { noForcedScroll = true; }
void pushLayer(bool hideParent = false);
void popLayer();
protected: protected:
static std::list<Window *> trash; static std::list<Window *> trash;
@@ -210,6 +213,8 @@ class Window
static bool _longPressed; static bool _longPressed;
bool loaded = false; bool loaded = false;
bool layerCreated = false;
bool parentHidden = false;
CloseHandler closeHandler; CloseHandler closeHandler;
FocusHandler focusHandler; FocusHandler focusHandler;
+1 -3
View File
@@ -76,7 +76,7 @@ SetupTopBarWidgetsPage::SetupTopBarWidgetsPage() :
Window(ViewMain::instance(), rect_t{}) Window(ViewMain::instance(), rect_t{})
{ {
// remember focus // remember focus
Layer::push(this); pushLayer();
auto viewMain = ViewMain::instance(); auto viewMain = ViewMain::instance();
@@ -109,8 +109,6 @@ void SetupTopBarWidgetsPage::deleteLater(bool detach, bool trash)
// and continue async deletion... // and continue async deletion...
Window::deleteLater(detach, trash); Window::deleteLater(detach, trash);
Layer::pop(this);
// restore screen setting tab on top // restore screen setting tab on top
QuickMenu::openPage(QM_UI_SETUP); QuickMenu::openPage(QM_UI_SETUP);
@@ -79,7 +79,7 @@ ViewMain* ViewMain::_instance = nullptr;
ViewMain::ViewMain() : ViewMain::ViewMain() :
NavWindow(MainWindow::instance(), MainWindow::instance()->getRect()) NavWindow(MainWindow::instance(), MainWindow::instance()->getRect())
{ {
Layer::push(this); pushLayer();
tile_view = lv_tileview_create(lvobj); tile_view = lv_tileview_create(lvobj);
lv_obj_set_pos(tile_view, rect.x, rect.y); lv_obj_set_pos(tile_view, rect.x, rect.y);
@@ -103,7 +103,6 @@ ViewMain::~ViewMain() { _instance = nullptr; }
void ViewMain::deleteLater(bool detach, bool trash) void ViewMain::deleteLater(bool detach, bool trash)
{ {
NavWindow::deleteLater(detach, trash); NavWindow::deleteLater(detach, trash);
Layer::pop(this);
QuickMenu::shutdownQuickMenu(); QuickMenu::shutdownQuickMenu();
} }
@@ -119,7 +119,7 @@ void SetupWidgetsPageSlot::addNewWidget(WidgetsContainer* container,
SetupWidgetsPage::SetupWidgetsPage(uint8_t customScreenIdx) : SetupWidgetsPage::SetupWidgetsPage(uint8_t customScreenIdx) :
Window(ViewMain::instance(), rect_t{}), customScreenIdx(customScreenIdx) Window(ViewMain::instance(), rect_t{}), customScreenIdx(customScreenIdx)
{ {
Layer::push(this); pushLayer();
// attach this custom screen here so we can display it // attach this custom screen here so we can display it
auto screen = customScreens[customScreenIdx]; auto screen = customScreens[customScreenIdx];
@@ -162,9 +162,6 @@ void SetupWidgetsPage::deleteLater(bool detach, bool trash)
{ {
Window::deleteLater(detach, trash); Window::deleteLater(detach, trash);
// restore screen setting tab on top
Layer::pop(this);
// and continue async deletion... // and continue async deletion...
auto screen = customScreens[customScreenIdx]; auto screen = customScreens[customScreenIdx];
if (screen) { if (screen) {
@@ -307,8 +307,7 @@ PageGroupBase::PageGroupBase(coord_t bodyY, EdgeTxIcon icon) :
{ {
etx_solid_bg(lvobj); etx_solid_bg(lvobj);
Layer::back()->hide(); pushLayer(true);
Layer::push(this);
body = new Window(this, {0, bodyY, LCD_W, LCD_H - bodyY}); body = new Window(this, {0, bodyY, LCD_W, LCD_H - bodyY});
body->setWindowFlag(NO_FOCUS); body->setWindowFlag(NO_FOCUS);
@@ -332,16 +331,6 @@ void PageGroupBase::checkEvents()
ViewMain::instance()->runBackground(); ViewMain::instance()->runBackground();
} }
void PageGroupBase::deleteLater(bool detach, bool trash)
{
if (_deleted) return;
NavWindow::deleteLater(detach, trash);
Layer::pop(this);
Layer::back()->show();
}
void PageGroupBase::onClicked() { Keyboard::hide(false); } void PageGroupBase::onClicked() { Keyboard::hide(false); }
void PageGroupBase::onCancel() void PageGroupBase::onCancel()
@@ -198,8 +198,6 @@ class PageGroupBase : public NavWindow
void checkEvents() override; void checkEvents() override;
void deleteLater(bool detach = true, bool trash = true) override;
#if defined(HARDWARE_KEYS) #if defined(HARDWARE_KEYS)
void doKeyShortcut(event_t event); void doKeyShortcut(event_t event);
void onPressSYS() override; void onPressSYS() override;
@@ -291,7 +291,7 @@ void QuickMenu::openQM(std::function<void()> cancelHandler,
std::function<void(bool close)> selectHandler, std::function<void(bool close)> selectHandler,
PageGroupBase* newPageGroup, QMPage newCurPage) PageGroupBase* newPageGroup, QMPage newCurPage)
{ {
Layer::push(this); pushLayer();
#if VERSION_MAJOR == 2 #if VERSION_MAJOR == 2
curPage = QM_NONE; curPage = QM_NONE;
@@ -514,7 +514,7 @@ void QuickMenu::onSelect(bool close)
void QuickMenu::closeMenu() void QuickMenu::closeMenu()
{ {
Layer::pop(this); popLayer();
hide(); hide();
if (cancelHandler) cancelHandler(); if (cancelHandler) cancelHandler();
cancelHandler = nullptr; cancelHandler = nullptr;
@@ -60,13 +60,12 @@ QMFavoritesPage::QMFavoritesPage():
void QMFavoritesPage::onCancel() void QMFavoritesPage::onCancel()
{ {
SubPage::onCancel();
if (changed) { if (changed) {
// Delete quick menu, and close parent page group (in case it is Favorites group) // Delete quick menu, and close parent page group (in case it is Favorites group)
QuickMenu::shutdownQuickMenu(); QuickMenu::shutdownQuickMenu();
QuickMenu::setCurrentPage(QM_NONE); QuickMenu::setCurrentPage(QM_NONE);
Layer::pop(this);
Layer::back()->onCancel(); Layer::back()->onCancel();
} }
SubPage::onCancel();
} }
+3 -7
View File
@@ -193,8 +193,7 @@ void StandaloneLuaWindow::attach()
// backup previous screen // backup previous screen
prevScreen = lv_scr_act(); prevScreen = lv_scr_act();
Layer::back()->hide(); pushLayer(true);
Layer::push(this);
if (!useLvglLayout()) { if (!useLvglLayout()) {
lv_group_add_obj(lv_group_get_default(), lvobj); lv_group_add_obj(lv_group_get_default(), lvobj);
@@ -218,11 +217,6 @@ void StandaloneLuaWindow::deleteLater(bool detach, bool trash)
luaScriptManager = nullptr; luaScriptManager = nullptr;
Window::deleteLater(detach, trash);
Layer::pop(this);
Layer::back()->show();
if (prevScreen) { if (prevScreen) {
prevScreen = nullptr; prevScreen = nullptr;
} }
@@ -238,6 +232,8 @@ void StandaloneLuaWindow::deleteLater(bool detach, bool trash)
luaState = prevLuaState; luaState = prevLuaState;
luaEmptyEventBuffer(); luaEmptyEventBuffer();
Window::deleteLater(detach, trash);
} }
void StandaloneLuaWindow::checkEvents() void StandaloneLuaWindow::checkEvents()