From 1487f3b78f48748cf4a5dcb2d94f1a472a9ec787 Mon Sep 17 00:00:00 2001 From: Martin Vladic Date: Fri, 13 Dec 2024 17:55:16 +0100 Subject: [PATCH] Fixed: [LVGL] LVGL action doesn't work inside user widget that is used inside another user widget #664 --- resources/eez-framework-amalgamation/eez-flow.cpp | 5 +++-- resources/eez-framework-amalgamation/eez-flow.h | 2 +- wasm/eez-framework | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/eez-framework-amalgamation/eez-flow.cpp b/resources/eez-framework-amalgamation/eez-flow.cpp index a9a4b6af..c29de08d 100644 --- 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 index 1cea2f2e..d196d52e 100644 --- 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 index 7dcacae5..48ec9b6f 160000 --- a/wasm/eez-framework +++ b/wasm/eez-framework @@ -1 +1 @@ -Subproject commit 7dcacae5b4b7936d36d1c7257ee51cc53e895925 +Subproject commit 48ec9b6f2bcdc7677b3f9485f6e6dbc07fbad732