eez-open#555

QixYuanmeng · Sep 27, 2024 · f2426be · f2426be
1 parent c17c919
commit f2426be
Show file tree

Hide file tree

Showing 5 changed files with 236 additions and 2 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.js b/packages/project-editor/flow/runtime/lvgl_runtime_v8.3.js
@@ -4831,6 +4831,8 @@ var _lvglSetTimelinePosition = Module['_lvglSetTimelinePosition'] = createExport
 var _lvglClearTimeline = Module['_lvglClearTimeline'] = createExportWrapper('lvglClearTimeline');
 var _lvglSetScrollBarMode = Module['_lvglSetScrollBarMode'] = createExportWrapper('lvglSetScrollBarMode');
 var _lvglSetScrollDir = Module['_lvglSetScrollDir'] = createExportWrapper('lvglSetScrollDir');
+var _lvglSetScrollSnapX = Module['_lvglSetScrollSnapX'] = createExportWrapper('lvglSetScrollSnapX');
+var _lvglSetScrollSnapY = Module['_lvglSetScrollSnapY'] = createExportWrapper('lvglSetScrollSnapY');
 var _lvglTabviewSetActive = Module['_lvglTabviewSetActive'] = createExportWrapper('lvglTabviewSetActive');
 var _lvglTabviewGetTabBar = Module['_lvglTabviewGetTabBar'] = createExportWrapper('lvglTabviewGetTabBar');
 var _lvglTabviewGetTabContent = Module['_lvglTabviewGetTabContent'] = createExportWrapper('lvglTabviewGetTabContent');

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/packages/project-editor/lvgl/actions.tsx b/packages/project-editor/lvgl/actions.tsx
@@ -60,6 +60,8 @@ import {
 } from "project-editor/lvgl/expression-property";
 import { buildExpression } from "project-editor/flow/expression";
 import { escapeCString } from "./widget-common";
+import { getLvglFlagCodes } from "./lvgl-versions";
+import { LVGL_FLAG_CODES } from "./lvgl-constants";
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -69,7 +71,9 @@ const LVGL_ACTIONS = {
     SET_PROPERTY: 2,
     ADD_STYLE: 3,
     REMOVE_STYLE: 4,
-    GROUP: 5
+    ADD_FLAG: 5,
+    CLEAR_FLAG: 6,
+    GROUP: 7
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -89,6 +93,10 @@ export class LVGLActionType extends EezObject {
                 return LVGLAddStyleActionType;
             else if (jsObject.action == "REMOVE_STYLE")
                 return LVGLRemoveStyleActionType;
+            else if (jsObject.action == "ADD_FLAG")
+                return LVGLAddFlagActionType;
+            else if (jsObject.action == "CLEAR_FLAG")
+                return LVGLClearFlagActionType;
             else return LVGLGroupActionType;
         },
 
@@ -186,6 +194,24 @@ export class LVGLActionType extends EezObject {
                     ),
                     LVGLRemoveStyleActionType
                 );
+            } else if (result.values.action == "ADD_FLAG") {
+                actionTypeObject = createObject<LVGLAddFlagActionType>(
+                    project._store,
+                    Object.assign(
+                        actionTypeProperties,
+                        LVGLAddFlagActionType.classInfo.defaultValue
+                    ),
+                    LVGLAddFlagActionType
+                );
+            } else if (result.values.action == "CLEAR_FLAG") {
+                actionTypeObject = createObject<LVGLClearFlagActionType>(
+                    project._store,
+                    Object.assign(
+                        actionTypeProperties,
+                        LVGLClearFlagActionType.classInfo.defaultValue
+                    ),
+                    LVGLClearFlagActionType
+                );
             } else if (result.values.action == "GROUP") {
                 actionTypeObject = createObject<LVGLGroupActionType>(
                     project._store,
@@ -1325,6 +1351,212 @@ registerClass("LVGLRemoveStyleActionType", LVGLRemoveStyleActionType);
 
 ////////////////////////////////////////////////////////////////////////////////
 
+export class LVGLAddFlagActionType extends LVGLActionType {
+    target: string;
+    flag: keyof typeof LVGL_FLAG_CODES;
+
+    override makeEditable() {
+        super.makeEditable();
+
+        makeObservable(this, {
+            target: observable,
+            flag: observable
+        });
+    }
+
+    static classInfo = makeDerivedClassInfo(LVGLActionType.classInfo, {
+        properties: [
+            {
+                name: "target",
+                displayName: "Target",
+                type: PropertyType.Enum,
+                enumItems: (actionType: LVGLAddFlagActionType) => {
+                    const lvglIdentifiers = ProjectEditor.getProjectStore(
+                        actionType
+                    ).lvglIdentifiers.getIdentifiersVisibleFromFlow(
+                        ProjectEditor.getFlow(actionType)
+                    );
+
+                    return lvglIdentifiers.map(lvglIdentifier => ({
+                        id: lvglIdentifier.identifier,
+                        label: lvglIdentifier.identifier
+                    }));
+                }
+            },
+            {
+                name: "flag",
+                type: PropertyType.Enum,
+                enumItems: (actionType: LVGLAddFlagActionType) => {
+                    return Object.keys(getLvglFlagCodes(actionType)).map(
+                        flag => ({
+                            id: flag,
+                            label: flag
+                        })
+                    );
+                }
+            }
+        ],
+        defaultValue: {},
+        listLabel: (action: LVGLAddFlagActionType, collapsed: boolean) => {
+            if (!collapsed) {
+                return "Add flag";
+            }
+            let singleItem =
+                (getParent(action) as LVGLActionType[]).length == 1;
+            if (singleItem) {
+                return (
+                    <>
+                        {action.flag} in {action.target}
+                    </>
+                );
+            } else {
+                return (
+                    <>
+                        Add flag {action.flag} in {action.target}
+                    </>
+                );
+            }
+        },
+        check: (object: LVGLAddFlagActionType, messages: IMessage[]) => {
+            const projectStore = ProjectEditor.getProjectStore(object);
+
+            if (object.target) {
+                const lvglIdentifier =
+                    projectStore.lvglIdentifiers.getIdentifierByName(
+                        ProjectEditor.getFlow(object),
+                        object.target
+                    );
+
+                if (lvglIdentifier == undefined) {
+                    messages.push(propertyNotFoundMessage(object, "target"));
+                }
+            } else {
+                messages.push(propertyNotSetMessage(object, "target"));
+            }
+        }
+    });
+
+    override build(assets: Assets, dataBuffer: DataBuffer) {
+        // target
+        dataBuffer.writeInt32(
+            assets.projectStore.lvglIdentifiers.getIdentifierByName(
+                ProjectEditor.getFlow(this),
+                this.target
+            )?.index ?? -1
+        );
+
+        // flag
+        dataBuffer.writeUint32(getLvglFlagCodes(this)[this.flag] ?? 0);
+    }
+}
+
+registerClass("LVGLAddFlagActionType", LVGLAddFlagActionType);
+
+////////////////////////////////////////////////////////////////////////////////
+
+export class LVGLClearFlagActionType extends LVGLActionType {
+    target: string;
+    flag: keyof typeof LVGL_FLAG_CODES;
+
+    override makeEditable() {
+        super.makeEditable();
+
+        makeObservable(this, {
+            target: observable,
+            flag: observable
+        });
+    }
+
+    static classInfo = makeDerivedClassInfo(LVGLActionType.classInfo, {
+        properties: [
+            {
+                name: "target",
+                displayName: "Target",
+                type: PropertyType.Enum,
+                enumItems: (actionType: LVGLClearFlagActionType) => {
+                    const lvglIdentifiers = ProjectEditor.getProjectStore(
+                        actionType
+                    ).lvglIdentifiers.getIdentifiersVisibleFromFlow(
+                        ProjectEditor.getFlow(actionType)
+                    );
+
+                    return lvglIdentifiers.map(lvglIdentifier => ({
+                        id: lvglIdentifier.identifier,
+                        label: lvglIdentifier.identifier
+                    }));
+                }
+            },
+            {
+                name: "flag",
+                type: PropertyType.Enum,
+                enumItems: (actionType: LVGLClearFlagActionType) => {
+                    return Object.keys(getLvglFlagCodes(actionType)).map(
+                        flag => ({
+                            id: flag,
+                            label: flag
+                        })
+                    );
+                }
+            }
+        ],
+        defaultValue: {},
+        listLabel: (action: LVGLClearFlagActionType, collapsed: boolean) => {
+            if (!collapsed) {
+                return "Clear flag";
+            }
+            let singleItem =
+                (getParent(action) as LVGLActionType[]).length == 1;
+            if (singleItem) {
+                return (
+                    <>
+                        {action.flag} in {action.target}
+                    </>
+                );
+            } else {
+                return (
+                    <>
+                        Clear flag {action.flag} in {action.target}
+                    </>
+                );
+            }
+        },
+        check: (object: LVGLClearFlagActionType, messages: IMessage[]) => {
+            const projectStore = ProjectEditor.getProjectStore(object);
+
+            if (object.target) {
+                const lvglIdentifier =
+                    projectStore.lvglIdentifiers.getIdentifierByName(
+                        ProjectEditor.getFlow(object),
+                        object.target
+                    );
+
+                if (lvglIdentifier == undefined) {
+                    messages.push(propertyNotFoundMessage(object, "target"));
+                }
+            } else {
+                messages.push(propertyNotSetMessage(object, "target"));
+            }
+        }
+    });
+
+    override build(assets: Assets, dataBuffer: DataBuffer) {
+        // target
+        dataBuffer.writeInt32(
+            assets.projectStore.lvglIdentifiers.getIdentifierByName(
+                ProjectEditor.getFlow(this),
+                this.target
+            )?.index ?? -1
+        );
+
+        // flag
+        dataBuffer.writeUint32(getLvglFlagCodes(this)[this.flag] ?? 0);
+    }
+}
+
+registerClass("LVGLClearFlagActionType", LVGLClearFlagActionType);
+
+////////////////////////////////////////////////////////////////////////////////
+
 const GROUP_ACTIONS = {
     SET_WRAP: 0,
     FOCUS_OBJ: 1,
+26 −0		src/eez/flow/components/lvgl.cpp
+16 −0		src/eez/flow/components/lvgl.h