Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 00:05:17 +03:00
Code Issues Wiki Activity

Update to latest libopenui

Browse source
This commit is contained in:
Bertrand Songis 2020-11-26 08:24:02 +01:00
parent 078654905b
commit 6e7f8176ed
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
radio/src/gui/colorlcd/fullscreen_dialog.cpp
View file

@ -113,9 +113,10 @@ void FullScreenDialog::checkEvents()
} }
} }
void FullScreenDialog::deleteLater(bool detach) void FullScreenDialog::deleteLater(bool detach, bool trash)
{ {
#if defined(HARDWARE_KEYS) #if defined(HARDWARE_KEYS)
#warning "TODO remove previousFocus from here, and use layers"
if (previousFocus) { if (previousFocus) {
previousFocus->setFocus(SET_FOCUS_DEFAULT); previousFocus->setFocus(SET_FOCUS_DEFAULT);
} }
@ -125,7 +126,7 @@ void FullScreenDialog::deleteLater(bool detach)
running = false; running = false;
} }
else { else {
Window::deleteLater(detach); Window::deleteLater(detach, trash);
} }
} }

2
radio/src/gui/colorlcd/fullscreen_dialog.h
View file

@ -59,7 +59,7 @@ class FullScreenDialog : public FormGroup
bool onTouchEnd(coord_t x, coord_t y) override; bool onTouchEnd(coord_t x, coord_t y) override;
#endif #endif
void deleteLater(bool detach=true) override; void deleteLater(bool detach = true, bool trash = true) override;
void checkEvents() override; void checkEvents() override;

5
radio/src/gui/colorlcd/page.cpp
View file

@ -67,13 +67,14 @@ Page::~Page()
#endif #endif
} }
void Page::deleteLater(bool detach) void Page::deleteLater(bool detach, bool trash)
{ {
#warning "TODO remove previousFocus and use layers"
if (previousFocus) { if (previousFocus) {
previousFocus->setFocus(SET_FOCUS_DEFAULT); previousFocus->setFocus(SET_FOCUS_DEFAULT);
} }
Window::deleteLater(detach); Window::deleteLater(detach, trash);
} }
void Page::paint(BitmapBuffer * dc) void Page::paint(BitmapBuffer * dc)

2
radio/src/gui/colorlcd/page.h
View file

@ -78,7 +78,7 @@ class Page: public Window {
} }
#endif #endif
void deleteLater(bool detach=true) override; void deleteLater(bool detach = true, bool trash = true) override;
void paint(BitmapBuffer * dc) override; void paint(BitmapBuffer * dc) override;