diff --git a/packages/project-editor/flow/runtime/cpp/eez-framework b/packages/project-editor/flow/runtime/cpp/eez-framework index 2273db7f..129db029 160000 --- a/packages/project-editor/flow/runtime/cpp/eez-framework +++ b/packages/project-editor/flow/runtime/cpp/eez-framework @@ -1 +1 @@ -Subproject commit 2273db7f97347325b2f167c07e538de90c6b93d0 +Subproject commit 129db029d6fc4fdd1086fc8f836d72feed469d54 diff --git a/packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm b/packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm index dc931ae4..d4d68935 100644 Binary files a/packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm and b/packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm differ diff --git a/packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm b/packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm index f67456e8..8e2a4046 100644 Binary files a/packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm and b/packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm differ diff --git a/resources/eez-framework-amalgamation/eez-flow.cpp b/resources/eez-framework-amalgamation/eez-flow.cpp index 27ce8442..45bff320 100644 --- a/resources/eez-framework-amalgamation/eez-flow.cpp +++ b/resources/eez-framework-amalgamation/eez-flow.cpp @@ -1,4 +1,4 @@ -/* Autogenerated on October 17, 2024 11:48:27 AM from eez-framework commit b44b5e6a9d48f0b14b8af0ab02537c9c14f4ab95 */ +/* Autogenerated on November 1, 2024 12:14:45 PM from eez-framework commit 2273db7f97347325b2f167c07e538de90c6b93d0 */ /* * eez-framework * @@ -7510,6 +7510,11 @@ extern "C" void flowPropagateValueLVGLEvent(void *flowState, unsigned componentI } int32_t gestureDir = (int32_t)LV_DIR_NONE; if (event_code == LV_EVENT_GESTURE) { +#if LVGL_VERSION_MAJOR >= 9 + lv_indev_wait_release(lv_indev_active()); +#else + lv_indev_wait_release(lv_indev_get_act()); +#endif gestureDir = (int32_t)lv_indev_get_gesture_dir( #if LVGL_VERSION_MAJOR >= 9 lv_indev_active() @@ -7588,6 +7593,9 @@ const char *evalStringArrayPropertyAndJoin(void *flowState, unsigned componentIn textPosition = strlen(textValue); } return textValue; + } else if (value.isString()) { + value.toText(textValue, sizeof(textValue)); + return textValue; } return ""; } diff --git a/resources/eez-framework-amalgamation/eez-flow.h b/resources/eez-framework-amalgamation/eez-flow.h index c3073f8b..6f7271bd 100644 --- a/resources/eez-framework-amalgamation/eez-flow.h +++ b/resources/eez-framework-amalgamation/eez-flow.h @@ -1,4 +1,4 @@ -/* Autogenerated on October 17, 2024 11:48:27 AM from eez-framework commit b44b5e6a9d48f0b14b8af0ab02537c9c14f4ab95 */ +/* Autogenerated on November 1, 2024 12:14:45 PM from eez-framework commit 2273db7f97347325b2f167c07e538de90c6b93d0 */ /* * eez-framework *