Call widget 'update' function is layout has changed.

EdgeTX · Jan 25, 2023 · 60b7393 · 60b7393
1 parent bbef86d
commit 60b7393
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 14 deletions.
diff --git a/radio/src/gui/colorlcd/widget.cpp b/radio/src/gui/colorlcd/widget.cpp
@@ -98,10 +98,6 @@ void Widget::onCancel()
 
 void Widget::update()
 {
-  auto container = dynamic_cast<WidgetsContainer*>(parent);
-  if (container) {
-    container->updateZones();
-  }
 }
 
 void Widget::setFullscreen(bool enable)
@@ -113,7 +109,10 @@ void Widget::setFullscreen(bool enable)
   if (!enable) {
 
     // Reset all zones in container
-    Widget::update();
+    auto container = dynamic_cast<WidgetsContainer*>(parent);
+    if (container)
+      container->updateZones();
+
     setWindowFlags(getWindowFlags() & ~OPAQUE);
     lv_obj_set_style_bg_opa(lvobj, LV_OPA_0, LV_PART_MAIN);
 

diff --git a/radio/src/gui/colorlcd/widgets/widgets_container_impl.h b/radio/src/gui/colorlcd/widgets/widgets_container_impl.h
@@ -135,8 +135,8 @@ class WidgetsContainerImpl : public WidgetsContainer
     for (int i = 0; i < N; i++) {
       if (widgets[i]) {
         auto zone = getZone(i);
-        widgets[i]->updateZoneRect(zone);
         widgets[i]->setRect(zone);
+        widgets[i]->updateZoneRect(zone);
       }
     }
   }

diff --git a/radio/src/lua/lua_widget.cpp b/radio/src/lua/lua_widget.cpp
@@ -291,6 +291,31 @@ void LuaWidget::update()
   }
 }
 
+// Update table on top of Lua stack - set entry with name 'idx' to value 'val'
+// Return true if value has changed
+bool LuaWidget::updateTable(const char* idx, int val)
+{
+  bool update = false;
+
+  // Check existing value (or invalid value)
+  lua_getfield(lsWidgets, -1, idx);
+  if (lua_isnumber(lsWidgets, -1)) {
+    int v = lua_tointeger(lsWidgets, -1);
+    update = (v != val);
+  } else {
+    // Force table update
+    update = true;
+  }
+  lua_pop(lsWidgets, 1);
+
+  if (update) {
+    lua_pushinteger(lsWidgets, val);
+    lua_setfield(lsWidgets, -2, idx);
+  }
+
+  return update;
+}
+
 void LuaWidget::updateZoneRect(rect_t rect)
 {
   if (lsWidgets)
@@ -299,16 +324,17 @@ void LuaWidget::updateZoneRect(rect_t rect)
 
     lua_rawgeti(lsWidgets, LUA_REGISTRYINDEX, zoneRectDataRef);
 
-    lua_pushinteger(lsWidgets, rect.w);
-    lua_setfield(lsWidgets, -2, "w");
-    lua_pushinteger(lsWidgets, rect.h);
-    lua_setfield(lsWidgets, -2, "h");
-    lua_pushinteger(lsWidgets, rect.x);
-    lua_setfield(lsWidgets, -2, "xabs");
-    lua_pushinteger(lsWidgets, rect.y);
-    lua_setfield(lsWidgets, -2, "yabs");
+    bool changed = false;
+
+    if (updateTable("w", rect.w)) changed = true;
+    if (updateTable("h", rect.h)) changed = true;
+    if (updateTable("xabs", rect.x)) changed = true;
+    if (updateTable("yabs", rect.y)) changed = true;
 
     lua_pop(lsWidgets, 1);
+
+    if (changed)
+      update();
   }
 }
 

diff --git a/radio/src/lua/lua_widget.h b/radio/src/lua/lua_widget.h
@@ -76,6 +76,7 @@ class LuaWidget : public Widget, public LuaEventHandler
 
   // Update 'zone' data
   void updateZoneRect(rect_t rect) override;
+  bool updateTable(const char* idx, int val);
 
  public:
   LuaWidget(const WidgetFactory* factory, Window* parent, const rect_t& rect,