#569

Author: mvladic

packages/eez-studio-types/index.d.ts

@@ -553,7 +553,7 @@ export interface IWasmFlowRuntime {
     _init(wasmModuleId: number, debuggerMessageSubsciptionFilter: number, assets: number, assetsSize: number, displayWidth: number, displayHeight: number, darkTheme: boolean, timeZone: number): void;
     _mainLoop(): boolean;
     _getSyncedBuffer(): number;
-    _onMouseWheelEvent(wheelDeltaY: number, wheelClicked: number): void;
+    _onMouseWheelEvent(wheelDeltaY: number, pressed: number): void;
     _onPointerEvent(x: number, y: number, pressed: number): void;
     _onKeyPressed(key: number): void;
     _onMessageFromDebugger(messageData: number, messageDataSize: number): void;

packages/project-editor/flow/runtime/cpp/lvgl-runtime/common/main.c

@@ -283,7 +283,6 @@ static void hal_init() {
         lv_indev_set_type(encoder_indev, LV_INDEV_TYPE_ENCODER);
         lv_indev_set_read_cb(encoder_indev, my_mousewheel_read);
         //lv_indev_set_mode(encoder_indev, LV_INDEV_MODE_EVENT);
-
 #else
         static lv_indev_drv_t indev_drv_3;
         lv_indev_drv_init(&indev_drv_3);
@@ -377,12 +376,12 @@ EM_PORT_API(void) onPointerEvent(int x, int y, int pressed) {
     mouse_pressed = pressed;
 }
 
-EM_PORT_API(void) onMouseWheelEvent(double yMouseWheel, int clicked) {
+EM_PORT_API(void) onMouseWheelEvent(double yMouseWheel, int pressed) {
     if (yMouseWheel >= 100 || yMouseWheel <= -100) {
         yMouseWheel /= 100;
     }
     mouse_wheel_delta = round(yMouseWheel);
-    mouse_wheel_pressed = clicked;
+    mouse_wheel_pressed = pressed;
 }
 
 EM_PORT_API(void) onKeyPressed(uint32_t key) {

packages/project-editor/flow/runtime/cpp/lvgl-runtime/common/src/flow.cpp

@@ -683,9 +683,11 @@ void doUpdateTasks() {
             const char *cur_val = lv_dropdown_get_options(updateTask.obj);
             if (strcmp(new_val, cur_val) != 0) lv_dropdown_set_options(updateTask.obj, new_val);
         } else if (updateTask.updateTaskType == UPDATE_TASK_TYPE_DROPDOWN_SELECTED) {
-            uint16_t new_val = (uint16_t)evalIntegerProperty(updateTask.flow_state, updateTask.component_index, updateTask.property_index, "Failed to evaluate Selected in Dropdown widget");
-            uint16_t cur_val = lv_dropdown_get_selected(updateTask.obj);
-            if (new_val != cur_val) lv_dropdown_set_selected(updateTask.obj, new_val);
+            if (!(lv_obj_get_state(updateTask.obj) & LV_STATE_EDITED)) {
+                uint16_t new_val = (uint16_t)evalIntegerProperty(updateTask.flow_state, updateTask.component_index, updateTask.property_index, "Failed to evaluate Selected in Dropdown widget");
+                uint16_t cur_val = lv_dropdown_get_selected(updateTask.obj);
+                if (new_val != cur_val) lv_dropdown_set_selected(updateTask.obj, new_val);
+            }
         } else if (updateTask.updateTaskType == UPDATE_TASK_TYPE_ROLLER_OPTIONS) {
             const char *new_val = evalStringArrayPropertyAndJoin(updateTask.flow_state, updateTask.component_index, updateTask.property_index, "Failed to evaluate Selected in Dropdown widget", "\n");
             const char *cur_val = lv_roller_get_options(updateTask.obj);

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

@@ -135,8 +135,11 @@ export class WasmRuntime extends RemoteRuntime {
         y: number;
         pressed: number;
     }[] = [];
+
+    wheelUpdated = false;
     wheelDeltaY = 0;
-    wheelClicked = 0;
+    wheelPressed = 0;
+
     keysPressed: number[] = [];
     screen: any;
     lastScreen: any;
@@ -574,8 +577,9 @@ export class WasmRuntime extends RemoteRuntime {
             wheel: this.isPaused
                 ? undefined
                 : {
+                      updated: this.wheelUpdated,
                       deltaY: this.wheelDeltaY,
-                      clicked: this.wheelClicked
+                      pressed: this.wheelPressed
                   },
             pointerEvents: this.isPaused ? undefined : this.pointerEvents,
             keysPressed: this.isPaused ? undefined : this.keysPressed,
@@ -586,8 +590,8 @@ export class WasmRuntime extends RemoteRuntime {
 
         this.worker.postMessage(message);
 
+        this.wheelUpdated = false;
         this.wheelDeltaY = 0;
-        this.wheelClicked = 0;
         this.pointerEvents = [];
         this.keysPressed = [];
     };
@@ -1300,8 +1304,10 @@ export const WasmCanvas = observer(
             }
 
             if (event.buttons == 4) {
-                wasmRuntime.wheelClicked = 1;
+                wasmRuntime.wheelUpdated = true;
+                wasmRuntime.wheelPressed = 1;
             }
+
             canvas.setPointerCapture(event.pointerId);
             this.sendPointerEvent(event);
         };
@@ -1315,6 +1321,13 @@ export const WasmCanvas = observer(
             if (!canvas) {
                 return;
             }
+
+            const wasmRuntime = this.context.runtime as WasmRuntime;
+            if (wasmRuntime) {
+                wasmRuntime.wheelUpdated = true;
+                wasmRuntime.wheelPressed = 0;
+            }
+
             canvas.releasePointerCapture(event.pointerId);
             this.sendPointerEvent(event);
         };
@@ -1324,6 +1337,13 @@ export const WasmCanvas = observer(
             if (!canvas) {
                 return;
             }
+
+            const wasmRuntime = this.context.runtime as WasmRuntime;
+            if (wasmRuntime) {
+                wasmRuntime.wheelUpdated = true;
+                wasmRuntime.wheelPressed = 0;
+            }
+
             canvas.releasePointerCapture(event.pointerId);
             this.sendPointerEvent(event);
         };
@@ -1342,6 +1362,7 @@ export const WasmCanvas = observer(
             if (!wasmRuntime) {
                 return;
             }
+            wasmRuntime.wheelUpdated = true;
             wasmRuntime.wheelDeltaY += event.deltaY;
         };
 

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

@@ -16,8 +16,9 @@ export interface RendererToWorkerMessage {
 
     // mouse data from Canvas
     wheel?: {
+        updated: boolean;
         deltaY: number;
-        clicked: number;
+        pressed: number;
     };
     pointerEvents?: {
         x: number;

packages/project-editor/flow/runtime/wasm-runtime.tsx

@@ -883,13 +883,10 @@ export function createWasmWorker(
         }
 
         if (rendererToWorkerMessage.wheel) {
-            if (
-                rendererToWorkerMessage.wheel.deltaY != 0 ||
-                rendererToWorkerMessage.wheel.clicked != 0
-            ) {
+            if (rendererToWorkerMessage.wheel.updated) {
                 WasmFlowRuntime._onMouseWheelEvent(
                     rendererToWorkerMessage.wheel.deltaY,
-                    rendererToWorkerMessage.wheel.clicked
+                    rendererToWorkerMessage.wheel.pressed
                 );
             }
         }