diff --git a/radio/src/thirdparty/libopenui/src/button.h b/radio/src/thirdparty/libopenui/src/button.h index 04ca3a8c8..a1bf1f0ee 100644 --- a/radio/src/thirdparty/libopenui/src/button.h +++ b/radio/src/thirdparty/libopenui/src/button.h @@ -88,7 +88,7 @@ class Button : public FormField { } #if defined(HARDWARE_KEYS) - void onEvent(event_t event); + void onEvent(event_t event) override; #endif #if defined(HARDWARE_TOUCH) diff --git a/radio/src/thirdparty/libopenui/src/mainwindow.cpp b/radio/src/thirdparty/libopenui/src/mainwindow.cpp index 48aec258b..69ce7d136 100644 --- a/radio/src/thirdparty/libopenui/src/mainwindow.cpp +++ b/radio/src/thirdparty/libopenui/src/mainwindow.cpp @@ -39,7 +39,7 @@ void MainWindow::emptyTrash() trash.clear(); } -void MainWindow::checkEvents(bool trash) +void MainWindow::checkEvents() { #if defined(HARDWARE_TOUCH) if (touchState.event == TE_DOWN) { @@ -60,10 +60,6 @@ void MainWindow::checkEvents(bool trash) #endif Window::checkEvents(); - - if (trash) { - emptyTrash(); - } } void MainWindow::invalidate(const rect_t & rect) @@ -106,7 +102,12 @@ bool MainWindow::refresh() void MainWindow::run(bool trash) { - checkEvents(trash); + checkEvents(); + + if (trash) { + emptyTrash(); + } + if (refresh()) { lcdRefresh(); } diff --git a/radio/src/thirdparty/libopenui/src/mainwindow.h b/radio/src/thirdparty/libopenui/src/mainwindow.h index fe6cd90ba..30b40ae49 100644 --- a/radio/src/thirdparty/libopenui/src/mainwindow.h +++ b/radio/src/thirdparty/libopenui/src/mainwindow.h @@ -39,7 +39,7 @@ class MainWindow: public Window { } #endif - void checkEvents(bool trash = true); + void checkEvents() override; void invalidate() { @@ -60,4 +60,4 @@ class MainWindow: public Window { extern MainWindow mainWindow; -#endif // _MAINWINDOW_H_ \ No newline at end of file +#endif // _MAINWINDOW_H_