Ensure all old top bar widgets are removed when changing models.

EdgeTX · Feb 13, 2025 · 06fc246 · 06fc246
1 parent d644f73
commit 06fc246
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/radio/src/gui/colorlcd/mainview/layout.cpp b/radio/src/gui/colorlcd/mainview/layout.cpp
@@ -66,6 +66,8 @@ void LayoutFactory::deleteCustomScreens()
       screen = nullptr;
     }
   }
+
+  ViewMain::instance()->getTopbar()->removeAllWidgets();
 }
 
 void LayoutFactory::loadDefaultLayout()

diff --git a/radio/src/gui/colorlcd/mainview/widgets_container_impl.h b/radio/src/gui/colorlcd/mainview/widgets_container_impl.h
@@ -83,6 +83,12 @@ class WidgetsContainerImpl : public WidgetsContainer
 
   virtual void create() { memset(persistentData, 0, sizeof(PersistentData)); }
 
+  void removeAllWidgets()
+  {
+    for (unsigned int i = 0; i < N; i++)
+      removeWidget(i);
+  }
+
   virtual void load()
   {
     unsigned int count = getZonesCount();
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,6 +66,8 @@ void LayoutFactory::deleteCustomScreens() @@
           screen = nullptr;
         }
       }
+      ViewMain::instance()->getTopbar()->removeAllWidgets();
     }
     void LayoutFactory::loadDefaultLayout()
@@ Expand Down @@