#792

Author: mvladic

packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm

@@ -948,6 +948,14 @@ export class LVGLBuild extends Build {
         this.postBuildCallbacks = [];
     }
 
+    functions: {
+        [key: string]: () => void;
+    } = {};
+
+    addFunction(name: string, callback: () => void) {
+        this.functions[name] = callback;
+    }
+
     async buildScreensDecl() {
         this.startBuild();
         const build = this;
@@ -1094,6 +1102,8 @@ export class LVGLBuild extends Build {
             build.line("");
         }
 
+        Object.values(this.functions).forEach(callback => callback());
+
         if (build.assets.projectStore.projectTypeTraits.hasFlowSupport) {
             for (const page of this.pages) {
                 page._lvglWidgets.forEach(widget => {
@@ -2448,8 +2458,8 @@ ${source}`;
 
                             // ensure consistent newlines accross all platforms
                             // (LF only) to avoid unnecessary VCS diffs
-                            source = source.replace(/\r\n/g, '\n');  // Windows
-                            source = source.replace(/\r/g, '\n');  // old Mac OS
+                            source = source.replace(/\r\n/g, "\n"); // Windows
+                            source = source.replace(/\r/g, "\n"); // old Mac OS
 
                             await writeTextFile(
                                 this.project._store.getAbsoluteFilePath(

packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm

@@ -18,6 +18,39 @@ import type { LVGLCode } from "project-editor/lvgl/to-lvgl-code";
 
 ////////////////////////////////////////////////////////////////////////////////
 
+const COMPARE_ROLLER_OPTIONS_FUNCTION = `int compareRollerOptions(lv_roller_t *roller, const char *new_val, const char *cur_val, lv_roller_mode_t mode) {
+    (void)(mode);
+
+    uint32_t new_option_count = 1;
+
+    for (int i = 0; ; i++) {
+        if (new_val[i] == '\\0') {
+            if (cur_val[i] != '\\0' && cur_val[i] != '\\n') {
+                return 1;
+            }
+            break;
+        }
+
+        if (new_val[i] != cur_val[i]) {
+            return 1;
+        }
+ 
+        if (new_val[i] == '\\n') {
+            new_option_count++;
+        }
+    }
+
+#if LVGL_VERSION_MAJOR >= 9
+    return lv_roller_get_option_count((const lv_obj_t *)roller) == new_option_count ? 0 : 1;    
+#else
+    return lv_roller_get_option_cnt((const lv_obj_t *)roller) == new_option_count ? 0 : 1;    
+#endif
+}
+
+`;
+
+////////////////////////////////////////////////////////////////////////////////
+
 export class LVGLRollerWidget extends LVGLWidget {
     options: string;
     optionsType: LVGLPropertyType;
@@ -159,6 +192,13 @@ export class LVGLRollerWidget extends LVGLWidget {
 
                 if (code.lvglBuild) {
                     const build = code.lvglBuild;
+
+                    if (!code.hasFlowSupport) {
+                        build.addFunction("compareRollerOptions", () => {
+                            build.text(COMPARE_ROLLER_OPTIONS_FUNCTION);
+                        });
+                    }
+
                     build.blockStart(
                         `if (compareRollerOptions((lv_roller_t *)${code.objectAccessor}, new_val, cur_val, LV_ROLLER_MODE_${this.mode}) != 0) {`
                     );

packages/project-editor/lvgl/build.ts

@@ -1,4 +1,4 @@
-/* Autogenerated on August 31, 2025 10:03:55 AM from eez-framework commit d872c9b5473b578cbca111732726fb5c562692b3 */
+/* Autogenerated on September 1, 2025 11:27:52 AM from eez-framework commit 228083aa29bd547ccfabd472cb45b681fad58efe */
 /*
  * eez-framework
  *
@@ -8013,22 +8013,28 @@ void *getFlowState(void *flowState, unsigned userWidgetComponentIndexOrPageIndex
 void deletePageFlowState(unsigned pageIndex) {
     eez::flow::deletePageFlowState(eez::g_mainAssets, (int16_t)pageIndex);
 }
-extern "C" bool compareRollerOptions(lv_roller_t *roller, const char *new_val, const char *cur_val, lv_roller_mode_t mode) {
-    if (mode == LV_ROLLER_MODE_NORMAL) {
-        return strcmp(new_val, cur_val) != 0;
+extern "C" int compareRollerOptions(lv_roller_t *roller, const char *new_val, const char *cur_val, lv_roller_mode_t mode) {
+    EEZ_UNUSED(mode);
+    uint32_t new_option_count = 1;
+    for (int i = 0; ; i++) {
+        if (new_val[i] == '\0') {
+            if (cur_val[i] != '\0' && cur_val[i] != '\n') {
+                return 1;
+            }
+            break;
+        }
+        if (new_val[i] != cur_val[i]) {
+            return 1;
+        }
+        if (new_val[i] == '\n') {
+            new_option_count++;
+        }
     }
-    auto n = strlen(new_val);
 #if LVGL_VERSION_MAJOR >= 9
-    size_t numPages = roller->inf_page_cnt;
+    return lv_roller_get_option_count((const lv_obj_t *)roller) == new_option_count ? 0 : 1;    
 #else
-    size_t numPages = LV_ROLLER_INF_PAGES;
+    return lv_roller_get_option_cnt((const lv_obj_t *)roller) == new_option_count ? 0 : 1;    
 #endif
-    for (size_t i = 0; i < numPages * (n + 1); i += n + 1) {
-        if (strncmp(new_val, cur_val + i, n) != 0) {
-            return true;
-        }
-    }
-    return false;
 }
 uint32_t eez_flow_get_selected_theme_index() {
     return g_selectedThemeIndex;

packages/project-editor/lvgl/widgets/Roller.tsx

@@ -1,4 +1,4 @@
-/* Autogenerated on August 31, 2025 10:03:55 AM from eez-framework commit d872c9b5473b578cbca111732726fb5c562692b3 */
+/* Autogenerated on September 1, 2025 11:27:52 AM from eez-framework commit 228083aa29bd547ccfabd472cb45b681fad58efe */
 /*
  * eez-framework
  *
@@ -3100,7 +3100,7 @@ float eez_easeOutBounce(float x);
 float eez_easeInOutBounce(float x);
 float getTimelinePosition(void *flowState);
 extern int g_eezFlowLvlgMeterTickIndex;
-bool compareRollerOptions(lv_roller_t *roller, const char *new_val, const char *cur_val, lv_roller_mode_t mode);
+int compareRollerOptions(lv_roller_t *roller, const char *new_val, const char *cur_val, lv_roller_mode_t mode);
 uint32_t eez_flow_get_selected_theme_index();
 #ifdef __cplusplus
 }