Merge branch 'master' into modern-dialog

flutter/lib/models/input_model.dart

@@ -458,10 +458,8 @@ class InputModel {
         return;
     }
     evt['type'] = type;
-    if (isDesktop) {
-      y = y - stateGlobal.tabBarHeight - stateGlobal.windowBorderWidth.value;
-      x -= stateGlobal.windowBorderWidth.value;
-    }
+    y -= CanvasModel.topToEdge;
+    x -= CanvasModel.leftToEdge;
     final canvasModel = parent.target!.canvasModel;
     final nearThr = 3;
     var nearRight = (canvasModel.size.width - x) < nearThr;
@@ -503,8 +501,21 @@ class InputModel {
     }
     x += d.x;
     y += d.y;
+    var evtX = 0;
+    var evtY = 0;
+    try {
+      evtX = x.round();
+      evtY = y.round();
+    } catch (e) {
+      debugPrintStack(
+          label: 'canvasModel.scale value ${canvasModel.scale}, $e');
+      return;
+    }
 
-    if (x < d.x || y < d.y || x > (d.x + d.width) || y > (d.y + d.height)) {
+    if (evtX < d.x ||
+        evtY < d.y ||
+        evtX > (d.x + d.width) ||
+        evtY > (d.y + d.height)) {
       // If left mouse up, no early return.
       if (evt['buttons'] != kPrimaryMouseButton || type != 'up') {
         return;
@@ -512,12 +523,12 @@ class InputModel {
     }
 
     if (type != '') {
-      x = 0;
-      y = 0;
+      evtX = 0;
+      evtY = 0;
     }
 
-    evt['x'] = '${x.round()}';
-    evt['y'] = '${y.round()}';
+    evt['x'] = '$evtX';
+    evt['y'] = '$evtY';
     var buttons = '';
     switch (evt['buttons']) {
       case kPrimaryMouseButton: