Add a dragthreshold to better distunguish right clicks and right drags (

#230) * add a drag threshold so right clicks are better distinguished from right drags especially on large screens * ignore mac files too * dont use less than 1 as a drag threshold Co-authored-by: Chris Fairclough <[email protected]>
Siccity · May 27, 2020 · a8daac6 · a8daac6
1 parent 8046e6e
commit a8daac6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,6 @@ sysinfo.txt
 .git.meta
 .gitignore.meta
 .gitattributes.meta
+
+# OS X only:
+.DS_Store
diff --git a/Scripts/Editor/NodeEditorAction.cs b/Scripts/Editor/NodeEditorAction.cs
@@ -32,6 +32,7 @@ public enum NodeActivity { Idle, HoldNode, DragNode, HoldGrid, DragGrid }
         private Rect selectionBox;
         private bool isDoubleClick = false;
         private Vector2 lastMousePosition;
+        private float dragThreshold = 1f;
 
         public void Controls() {
             wantsMouseMove = true;
@@ -134,8 +135,11 @@ public void Controls() {
                             Repaint();
                         }
                     } else if (e.button == 1 || e.button == 2) {
-                        panOffset += e.delta * zoom;
-                        isPanning = true;
+                        //check drag threshold for larger screens
+                        if (e.delta.magnitude > dragThreshold) {
+                            panOffset += e.delta * zoom;
+                            isPanning = true;
+                        }
                     }
                     break;
                 case EventType.MouseDown:

diff --git a/Scripts/Editor/NodeEditorWindow.cs b/Scripts/Editor/NodeEditorWindow.cs
@@ -81,6 +81,8 @@ void OnFocus() {
                 graphEditor.OnWindowFocus();
                 if (NodeEditorPreferences.GetSettings().autoSave) AssetDatabase.SaveAssets();
             }
+
+            dragThreshold = Math.Max(1f, Screen.width / 1000f);
         }
 
         void OnLostFocus() {