backport of EdgeTX#4393 to 2.9.2

mha1 · Dec 13, 2023 · 7ab6a81 · 7ab6a81 · Kevltan · Dec 14, 2023
1 parent 8faf131
commit 7ab6a81
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 2 deletions.
diff --git a/radio/src/gui/colorlcd/model_outputs.cpp b/radio/src/gui/colorlcd/model_outputs.cpp
@@ -232,7 +232,7 @@ class OutputLineButton : public ListLineButton
 
   void checkEvents() override
   {
-    Window::checkEvents();
+    ListLineButton::checkEvents();
     if (!init) return;
 
     int newValue = channelOutputs[index];

diff --git a/radio/src/gui/colorlcd/page.cpp b/radio/src/gui/colorlcd/page.cpp
@@ -23,6 +23,7 @@
 #include "mainwindow.h"
 #include "keyboard_base.h"
 #include "opentx.h"
+#include "view_main.h"
 
 PageHeader::PageHeader(Page * parent, uint8_t icon):
   FormGroup(parent, { 0, 0, LCD_W, MENU_HEADER_HEIGHT }, OPAQUE),
@@ -89,6 +90,12 @@ void Page::onCancel()
   deleteLater();
 }
 
+void Page::checkEvents()
+{
+  ViewMain::instance()->runBackground();
+  //NavWindow::checkEvents();
+}
+
 void Page::onClicked()
 {
   Keyboard::hide();

diff --git a/radio/src/gui/colorlcd/page.h b/radio/src/gui/colorlcd/page.h
@@ -63,6 +63,8 @@ class Page : public Window
   PageHeader header;
   FormWindow body;
 
+  void checkEvents() override;
+
   void onEvent(event_t event) override;
 };
 

diff --git a/radio/src/gui/colorlcd/radio_theme.cpp b/radio/src/gui/colorlcd/radio_theme.cpp
@@ -399,7 +399,7 @@ class ThemeEditPage : public Page
         started = true;
         _themeName->setText(_theme.getName());
       }
-      Window::checkEvents();
+      Page::checkEvents();
     }
 
     void editColorPage()

diff --git a/radio/src/gui/colorlcd/tabsgroup.cpp b/radio/src/gui/colorlcd/tabsgroup.cpp
@@ -263,6 +263,7 @@ void TabsGroup::checkEvents()
   if (currentTab) {
     currentTab->checkEvents();
   }
+  ViewMain::instance()->runBackground();
 
   static uint32_t lastRefresh = 0;
   uint32_t now = RTOS_GET_MS();

diff --git a/radio/src/gui/colorlcd/view_main.cpp b/radio/src/gui/colorlcd/view_main.cpp
@@ -410,3 +410,12 @@ void ViewMain::long_pressed(lv_event_t* e)
     lv_indev_wait_release(lv_indev_get_act());
   }
 }
+
+void ViewMain::runBackground()
+{
+  topbar->runBackground();
+  for (int i = 0; i < MAX_CUSTOM_SCREENS; i += 1) {
+    if (customScreens[i])
+      customScreens[i]->runBackground();
+  }
+}
diff --git a/radio/src/gui/colorlcd/view_main.h b/radio/src/gui/colorlcd/view_main.h
@@ -83,6 +83,8 @@ class ViewMain: public Window
     void onClicked() override;
     void onCancel() override;
 
+    void runBackground();
+
   protected:
     static ViewMain * _instance;
 

diff --git a/radio/src/gui/colorlcd/widgets/widgets_container_impl.h b/radio/src/gui/colorlcd/widgets/widgets_container_impl.h
@@ -143,6 +143,15 @@ class WidgetsContainerImpl : public WidgetsContainer
 
   void adjustLayout() override {}
   void updateFromTheme() override {};
+
+  void runBackground() override
+  {
+    for (int i = 0; i < N; i++) {
+      if (widgets[i]) {
+        widgets[i]->background();
+      }
+    }
+  }
 
  protected:
   PersistentData* persistentData;

diff --git a/radio/src/gui/colorlcd/widgets_container.h b/radio/src/gui/colorlcd/widgets_container.h
@@ -89,6 +89,7 @@ class WidgetsContainer: public Window
     virtual void adjustLayout() = 0;
     virtual void updateZones() = 0;
     virtual void updateFromTheme() = 0;
+    virtual void runBackground() = 0;
 };