From 9fea53702a952fa6dd35410d633c0aa7c1436ecc Mon Sep 17 00:00:00 2001 From: gagarinlg Date: Thu, 20 Jan 2022 12:40:58 +0100 Subject: [PATCH] force touch screen to be on in full screen dialogs reset backlight timeout when changing backlight settings --- radio/src/gui/colorlcd/fullscreen_dialog.cpp | 12 ++++++++++-- radio/src/gui/colorlcd/radio_setup.cpp | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/colorlcd/fullscreen_dialog.cpp b/radio/src/gui/colorlcd/fullscreen_dialog.cpp index 35b7a1662..72d3416b4 100644 --- a/radio/src/gui/colorlcd/fullscreen_dialog.cpp +++ b/radio/src/gui/colorlcd/fullscreen_dialog.cpp @@ -158,6 +158,10 @@ void FullScreenDialog::runForever() { running = true; + MainWindow* mainWin = MainWindow::instance(); +#if defined(HARDWARE_TOUCH) + mainWin->setTouchEnabled(true); +#endif while (running) { resetBacklightTimeout(); @@ -178,7 +182,7 @@ void FullScreenDialog::runForever() WDG_RESET(); RTOS_WAIT_MS(1); - MainWindow::instance()->run(false); + mainWin->run(false); } deleteLater(); @@ -188,6 +192,10 @@ void FullScreenDialog::runForeverNoPwrCheck() { running = true; + MainWindow* mainWin = MainWindow::instance(); +#if defined(HARDWARE_TOUCH) + mainWin->setTouchEnabled(true); +#endif while (running) { resetBacklightTimeout(); @@ -195,7 +203,7 @@ void FullScreenDialog::runForeverNoPwrCheck() WDG_RESET(); RTOS_WAIT_MS(1); - MainWindow::instance()->run(false); + mainWin->run(false); } deleteLater(); diff --git a/radio/src/gui/colorlcd/radio_setup.cpp b/radio/src/gui/colorlcd/radio_setup.cpp index 3b30af9d1..dbc1802cb 100644 --- a/radio/src/gui/colorlcd/radio_setup.cpp +++ b/radio/src/gui/colorlcd/radio_setup.cpp @@ -560,4 +560,5 @@ void RadioSetupPage::updateBacklightControls() backlightOffBright->enable(false); break; } + resetBacklightTimeout(); }