[LVGL] Support strings for roller options (Expression type) #592

eez-open · Nov 1, 2024 · eb590b8 · eb590b8
1 parent 968e43c
commit eb590b8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/packages/project-editor/flow/runtime/cpp/eez-framework b/packages/project-editor/flow/runtime/cpp/eez-framework
diff --git a/packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm b/packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm
diff --git a/packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm b/packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm
diff --git 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
@@ -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
  *