From 5391d6836440362714ef05ed0fdf9ba9600451f1 Mon Sep 17 00:00:00 2001 From: philmoz Date: Tue, 3 Oct 2023 12:11:18 +1100 Subject: [PATCH] fix(color): Clear edit mode when page closes (#4152) --- radio/src/thirdparty/libopenui/src/form.cpp | 7 +++++++ radio/src/thirdparty/libopenui/src/form.h | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/radio/src/thirdparty/libopenui/src/form.cpp b/radio/src/thirdparty/libopenui/src/form.cpp index 20a1cb780..d2d08f4f3 100644 --- a/radio/src/thirdparty/libopenui/src/form.cpp +++ b/radio/src/thirdparty/libopenui/src/form.cpp @@ -72,6 +72,13 @@ void FormField::onCancel() } } +void FormField::deleteLater(bool detach, bool trash) +{ + if (isEditMode()) + setEditMode(false); + Window::deleteLater(detach, trash); +} + FormWindow::Line::Line(Window* parent, lv_obj_t* obj, FlexGridLayout* layout) : Window(parent, obj), layout(layout) { diff --git a/radio/src/thirdparty/libopenui/src/form.h b/radio/src/thirdparty/libopenui/src/form.h index d9c6526be..0ad10e108 100644 --- a/radio/src/thirdparty/libopenui/src/form.h +++ b/radio/src/thirdparty/libopenui/src/form.h @@ -45,7 +45,8 @@ class FormField : public Window void onClicked() override; void onCancel() override; - + void deleteLater(bool detach = true, bool trash = true) override; + protected: bool editMode = false; bool enabled = true;