piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 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
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/fullscreen_dialog.cpp
+3 -2
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)
#warning "TODO remove previousFocus from here, and use layers"
if (previousFocus) {
previousFocus->setFocus(SET_FOCUS_DEFAULT);
}
@@ -125,7 +126,7 @@ void FullScreenDialog::deleteLater(bool detach)
running = false;
}
else {
Window::deleteLater(detach);
Window::deleteLater(detach, trash);
}
}
radio/src/gui/colorlcd/fullscreen_dialog.h
+1 -1
View File
@@ -59,7 +59,7 @@ class FullScreenDialog : public FormGroup
bool onTouchEnd(coord_t x, coord_t y) override;
#endif
void deleteLater(bool detach=true) override;
void deleteLater(bool detach = true, bool trash = true) override;
void checkEvents() override;
radio/src/gui/colorlcd/page.cpp
+3 -2
View File
@@ -67,13 +67,14 @@ Page::~Page()
#endif
}
void Page::deleteLater(bool detach)
void Page::deleteLater(bool detach, bool trash)
{
#warning "TODO remove previousFocus and use layers"
if (previousFocus) {
previousFocus->setFocus(SET_FOCUS_DEFAULT);
}
Window::deleteLater(detach);
Window::deleteLater(detach, trash);
}
void Page::paint(BitmapBuffer * dc)
radio/src/gui/colorlcd/page.h
+1 -1
View File
@@ -78,7 +78,7 @@ class Page: public Window {
}
#endif
void deleteLater(bool detach=true) override;
void deleteLater(bool detach = true, bool trash = true) override;
void paint(BitmapBuffer * dc) override;