#740

Author: mvladic

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

@@ -5352,6 +5352,7 @@ var _lv_msg_init = Module['_lv_msg_init'] = createExportWrapper('lv_msg_init');
 var _lv_snprintf = Module['_lv_snprintf'] = createExportWrapper('lv_snprintf');
 var _lv_fs_tell = Module['_lv_fs_tell'] = createExportWrapper('lv_fs_tell');
 var _lv_fs_write = Module['_lv_fs_write'] = createExportWrapper('lv_fs_write');
+var _strncmp = Module['_strncmp'] = createExportWrapper('strncmp');
 var _lv_fragment_create = Module['_lv_fragment_create'] = createExportWrapper('lv_fragment_create');
 var _lv_fragment_del = Module['_lv_fragment_del'] = createExportWrapper('lv_fragment_del');
 var _lv_fragment_del_obj = Module['_lv_fragment_del_obj'] = createExportWrapper('lv_fragment_del_obj');

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

@@ -6409,6 +6409,7 @@ var _lv_win_add_title = Module['_lv_win_add_title'] = createExportWrapper('lv_wi
 var _lv_win_get_header = Module['_lv_win_get_header'] = createExportWrapper('lv_win_get_header');
 var _lv_win_add_button = Module['_lv_win_add_button'] = createExportWrapper('lv_win_add_button');
 var _lv_win_get_content = Module['_lv_win_get_content'] = createExportWrapper('lv_win_get_content');
+var _strncmp = Module['_strncmp'] = createExportWrapper('strncmp');
 var _onMqttEvent = Module['_onMqttEvent'] = createExportWrapper('onMqttEvent');
 var _strcmp = Module['_strcmp'] = createExportWrapper('strcmp');
 var __evalTextProperty = Module['__evalTextProperty'] = createExportWrapper('_evalTextProperty');

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

@@ -385,6 +385,7 @@ export const LVGL_PARTS_8: { [key: string]: number } = {
     CURSOR: 0x070000, // LV_PART_CURSOR       Mark a specific place e.g. for text area's cursor or on a chart
 
     CUSTOM1: 0x080000, // LV_PART_CUSTOM_FIRST Extension point for custom widgets
+    TEXTAREA_PLACEHOLDER: 0x080000,
 
     ANY: 0x0f0000 // LV_PART_ANY          Special value can be used in some functions to target all parts
 };
@@ -399,6 +400,7 @@ export const LVGL_PARTS_9: { [key: string]: number } = {
     CURSOR: 0x060000, // LV_PART_CURSOR       Mark a specific place e.g. for text area's cursor or on a chart
 
     CUSTOM1: 0x080000, // LV_PART_CUSTOM_FIRST Extension point for custom widgets
+    TEXTAREA_PLACEHOLDER: 0x080000,
 
     ANY: 0x0f0000 // LV_PART_ANY          Special value can be used in some functions to target all parts
 };

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

@@ -120,6 +120,7 @@ export interface LVGLCode {
 
     if(a: any, callback: () => void): void;
     ifStringNotEqual(a: any, b: any, callback: () => void): void;
+    ifStringNotEqualN(a: any, b: any, n: any, callback: () => void): void;
 
     ifIntegerLess(a: any, b: any, callback: () => void): void;
     ifIntegerNotEqual(a: any, b: any, callback: () => void): void;
@@ -588,6 +589,12 @@ export class SimulatorLVGLCode implements LVGLCode {
         }
     }
 
+    ifStringNotEqualN(a: any, b: any, n: any, callback: () => void) {
+        if (this.callFreeFunction("strncmp", a, b, n) != 0) {
+            callback();
+        }
+    }
+
     ifIntegerLess(a: any, b: any, callback: () => void) {
         if (a < b) {
             callback();
@@ -1143,6 +1150,14 @@ export class BuildLVGLCode implements LVGLCode {
         build.blockEnd(`}`);
     }
 
+    ifStringNotEqualN(a: any, b: any, n: any, callback: () => void) {
+        const build = this.build;
+
+        build.blockStart(`if (strncmp(${a}, ${b}, ${n}) != 0) {`);
+        callback();
+        build.blockEnd(`}`);
+    }
+
     ifIntegerLess(a: any, b: any, callback: () => void) {
         const build = this.build;
 

packages/project-editor/lvgl/lvgl-constants.ts

@@ -97,7 +97,13 @@ export class LVGLTextareaWidget extends LVGLWidget {
 
         lvgl: (widget: LVGLTextareaWidget, project: Project) => {
             return {
-                parts: ["MAIN", "SELECTED", "CURSOR"],
+                parts: [
+                    "MAIN",
+                    "SELECTED",
+                    "CURSOR",
+                    "SCROLLBAR",
+                    "TEXTAREA_PLACEHOLDER"
+                ],
                 defaultFlags:
                     project.settings.general.lvglVersion == "9.0"
                         ? "CLICKABLE|CLICK_FOCUSABLE|GESTURE_BUBBLE|PRESS_LOCK|SCROLLABLE|SCROLL_CHAIN_HOR|SCROLL_CHAIN_VER|SCROLL_ELASTIC|SCROLL_MOMENTUM|SCROLL_ON_FOCUS|SNAPPABLE"
@@ -168,7 +174,13 @@ export class LVGLTextareaWidget extends LVGLWidget {
                         "lv_textarea_get_text"
                     );
 
-                    code.ifStringNotEqual(new_val, cur_val, () => {
+                    const max_length = code.callObjectFunctionWithAssignment(
+                        "uint32_t",
+                        "max_length",
+                        "lv_textarea_get_max_length"
+                    );
+
+                    code.ifStringNotEqualN(new_val, cur_val, max_length, () => {
                         code.tickChangeStart();
                         code.callObjectFunction(
                             "lv_textarea_set_text",

packages/project-editor/lvgl/to-lvgl-code.ts

@@ -561,4 +561,4 @@ void dump_custom_styles() {
     printf("LV_STYLE_GRID_CELL_Y_ALIGN %d\n", LV_STYLE_GRID_CELL_Y_ALIGN);
 }
 
-#endif
+#endif

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

@@ -1,6 +1,7 @@
 _malloc
 _free
 _strcmp
+_strncmp
 _setObjectIndex
 __evalTextProperty
 __evalIntegerProperty

wasm/lvgl-runtime/common/main.c

@@ -1,6 +1,7 @@
 _malloc
 _free
 _strcmp
+_strncmp
 _setObjectIndex
 __evalTextProperty
 __evalIntegerProperty

wasm/lvgl-runtime/v8.3/exported-functions-misc.txt

@@ -1,6 +1,7 @@
 _malloc
 _free
 _strcmp
+_strncmp
 _setObjectIndex
 __evalTextProperty
 __evalIntegerProperty

wasm/lvgl-runtime/v8.3/exported-functions.txt

@@ -1,6 +1,7 @@
 _malloc
 _free
 _strcmp
+_strncmp
 _setObjectIndex
 __evalTextProperty
 __evalIntegerProperty