From a74b69da124790bea07794cf7da73378276027ee Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 26 Nov 2020 10:26:46 +0100 Subject: [PATCH] Update to latest libopenui --- radio/src/gui/colorlcd/page.cpp | 7 ------- radio/src/gui/colorlcd/page.h | 11 ++++++++++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/radio/src/gui/colorlcd/page.cpp b/radio/src/gui/colorlcd/page.cpp index 1d13e66ab..8f827f962 100644 --- a/radio/src/gui/colorlcd/page.cpp +++ b/radio/src/gui/colorlcd/page.cpp @@ -35,13 +35,6 @@ PageHeader::PageHeader(Page * parent, uint8_t icon): { } -PageHeader::~PageHeader() -{ -#if defined(HARDWARE_TOUCH) - back.deleteLater(true, false); -#endif -} - void PageHeader::paint(BitmapBuffer * dc) { OpenTxTheme::instance()->drawMenuBackground(dc, getIcon(), ""); diff --git a/radio/src/gui/colorlcd/page.h b/radio/src/gui/colorlcd/page.h index 05c6679d2..1f66c35bf 100644 --- a/radio/src/gui/colorlcd/page.h +++ b/radio/src/gui/colorlcd/page.h @@ -30,7 +30,16 @@ class PageHeader: public FormGroup public: PageHeader(Page * parent, uint8_t icon); - ~PageHeader() override; +#if defined(HARDWARE_TOUCH) + void deleteLater(bool detach = true, bool trash = true) + { + if (_deleted) + return; + + back.deleteLater(true, false); + FormGroup::deleteLater(detach, trash); + } +#endif void paint(BitmapBuffer * dc) override;