From 729f538d67c3e04991fe28503f02f8f5c56725aa Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 26 Jun 2020 16:02:18 +0200 Subject: [PATCH] Add a getter Window::deleted() --- radio/src/thirdparty/libopenui/src/modal_window.h | 2 +- radio/src/thirdparty/libopenui/src/window.cpp | 4 ++-- radio/src/thirdparty/libopenui/src/window.h | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/radio/src/thirdparty/libopenui/src/modal_window.h b/radio/src/thirdparty/libopenui/src/modal_window.h index 2ec3e3629..9fed468bd 100644 --- a/radio/src/thirdparty/libopenui/src/modal_window.h +++ b/radio/src/thirdparty/libopenui/src/modal_window.h @@ -36,7 +36,7 @@ class ModalWindow: public Window void deleteLater() { - if (deleted) + if (_deleted) return; if (previousFocus) { diff --git a/radio/src/thirdparty/libopenui/src/window.cpp b/radio/src/thirdparty/libopenui/src/window.cpp index ea5ec763d..df605368d 100644 --- a/radio/src/thirdparty/libopenui/src/window.cpp +++ b/radio/src/thirdparty/libopenui/src/window.cpp @@ -69,7 +69,7 @@ void Window::detach() void Window::deleteLater(bool detach) { - if (deleted) + if (_deleted) return; TRACE_WINDOWS("Delete %p %s", this, getWindowDebugString().c_str()); @@ -89,7 +89,7 @@ void Window::deleteLater(bool detach) trash.push_back(this); - deleted = true; + _deleted = true; } void Window::clear() diff --git a/radio/src/thirdparty/libopenui/src/window.h b/radio/src/thirdparty/libopenui/src/window.h index 18b131828..0bc16533c 100644 --- a/radio/src/thirdparty/libopenui/src/window.h +++ b/radio/src/thirdparty/libopenui/src/window.h @@ -342,6 +342,11 @@ class Window { void detach(); + bool deleted() + { + return _deleted; + } + protected: Window * parent; std::list children; @@ -354,7 +359,7 @@ class Window { coord_t scrollPositionY = 0; WindowFlags windowFlags; LcdFlags textFlags; - bool deleted = false; + bool _deleted = false; static Window * focusWindow; static Window * slidingWindow;