Fixed: [LVGL] LVGL action doesn't work inside user widget that is use…

…d inside another user widget #664
eez-open · Dec 13, 2024 · 1487f3b · 1487f3b
1 parent f815023
commit 1487f3b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/resources/eez-framework-amalgamation/eez-flow.cpp b/resources/eez-framework-amalgamation/eez-flow.cpp
@@ -1,4 +1,4 @@
-/* Autogenerated on December 10, 2024 10:49:42 AM from eez-framework commit 20567d18ee9cf9571eed6954b52170f2b920b7b1 */
+/* Autogenerated on December 13, 2024 5:53:17 PM from eez-framework commit 7dcacae5b4b7936d36d1c7257ee51cc53e895925 */
 /*
  * eez-framework
  *
@@ -4185,7 +4185,8 @@ void executeLVGLComponent(FlowState *flowState, unsigned componentIndex) {
         NAME = getLvglObjectFromIndexHook(flowState->lvglWidgetStartIndex + NAME##_WidgetIndex); \
     } else { \
         int32_t NAME##_WidgetIndex = NAME##Value.getInt(); \
-        NAME = getLvglObjectFromIndexHook(flowState->lvglWidgetStartIndex + NAME##_WidgetIndex); \
+        for (FlowState *fs = flowState; fs; fs = fs->parentFlowState) NAME##_WidgetIndex += fs->lvglWidgetStartIndex; \
+        NAME = getLvglObjectFromIndexHook(NAME##_WidgetIndex); \
     } \
     if (!NAME) { \
         throwError(flowState, componentIndex, FlowError::NullInAction("Widget", actionName, actionIndex)); \

diff --git a/resources/eez-framework-amalgamation/eez-flow.h b/resources/eez-framework-amalgamation/eez-flow.h
@@ -1,4 +1,4 @@
-/* Autogenerated on December 10, 2024 10:49:42 AM from eez-framework commit 20567d18ee9cf9571eed6954b52170f2b920b7b1 */
+/* Autogenerated on December 13, 2024 5:53:17 PM from eez-framework commit 7dcacae5b4b7936d36d1c7257ee51cc53e895925 */
 /*
  * eez-framework
  *

diff --git a/wasm/eez-framework b/wasm/eez-framework