Suppress context menu for common actions (#162)

miroiu · web-flow · commit 58c9ac58e13d · 2024-11-29T21:30:59.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 > - Breaking Changes:
 >	- Made the setter of NodifyEditor.IsPanning private
 >	- Made SelectionHelper internal
+>	- Renamed HandleRightClickAfterPanningThreshold to MouseActionSuppressionThreshold in NodifyEditor
 >	- Renamed StartCutting to BeginCutting in NodifyEditor
 >	- Renamed PushItems to UpdatePushedArea and StartPushingItems to BeginPushingItems in NodifyEditor
 >	- Renamed UnselectAllConnection to UnselectAllConnections in NodifyEditor
@@ -15,8 +16,10 @@
 >	- Added BeginSelecting, UpdateSelection, EndSelecting, CancelSelecting and AllowSelectionCancellation to NodifyEditor
 >	- Added IsDragging, BeginDragging, UpdateDragging, EndDragging and CancelDragging to NodifyEditor
 >	- Added Select, BeginDragging, UpdateDragging, EndDragging and CancelDragging to ItemContainer
+>	- Added PreserveSelectionOnRightClick configuration field to ItemContainer
 > - Bugfixes:
->	- Fixed ItemContainer being selected by releasing the mouse button on it without having the mouse captured
+>	- Fixed an issue where the ItemContainer was selected by releasing the mouse button on it, even when the mouse was not captured
+>	- Fixed an issue where the Home button caused the editor to fail to display items when contained within a ScrollViewer
 	
 #### **Version 6.6.0**
 
diff --git a/Examples/Nodify.Playground/EditorSettings.cs b/Examples/Nodify.Playground/EditorSettings.cs
@@ -211,10 +211,10 @@ private EditorSettings()
             _advancedSettings = new List<ISettingViewModel>()
             {
                 new ProxySettingViewModel<double>(
-                    () => Instance.HandleRightClickAfterPanningThreshold,
-                    val => Instance.HandleRightClickAfterPanningThreshold = val,
-                    "Disable context menu after panning: ",
-                    "Disable after mouse moved this far"),
+                    () => Instance.MouseActionSuppressionThreshold,
+                    val => Instance.MouseActionSuppressionThreshold = val,
+                    "Context menu suppression threshold: ",
+                    "Disable context menu after mouse moved this far"),
                 new ProxySettingViewModel<double>(
                     () => Instance.AutoPanningTickRate,
                     val => Instance.AutoPanningTickRate = val,
@@ -585,10 +585,10 @@ public GroupingMovementMode GroupingNodeMovement
 
         #region Advanced settings
 
-        public double HandleRightClickAfterPanningThreshold
+        public double MouseActionSuppressionThreshold
         {
-            get => NodifyEditor.HandleRightClickAfterPanningThreshold;
-            set => NodifyEditor.HandleRightClickAfterPanningThreshold = value;
+            get => NodifyEditor.MouseActionSuppressionThreshold;
+            set => NodifyEditor.MouseActionSuppressionThreshold = value;
         }
 
         public double AutoPanningTickRate
diff --git a/Examples/Nodify.StateMachine/Helpers/BlackboardDescriptor.cs b/Examples/Nodify.StateMachine/Helpers/BlackboardDescriptor.cs
@@ -128,7 +128,7 @@ public static List<BlackboardItemReferenceViewModel> GetAvailableItems<T>()
             for (int i = 0; i < types.Length; i++)
             {
                 var type = types[i];
-                if (type.IsClass && !type.IsAbstract && ourType.IsAssignableFrom(type))
+                if (type.IsClass && !type.IsAbstract && ourType.IsAssignableFrom(type) && type.GetCustomAttribute<BlackboardItemAttribute>() != null)
                 {
                     result.Add(GetReference(type));
                 }
diff --git a/Examples/Nodify.StateMachine/MainWindow.xaml b/Examples/Nodify.StateMachine/MainWindow.xaml
@@ -32,7 +32,6 @@
         </Grid.ColumnDefinitions>
 
         <ScrollViewer CanContentScroll="True"
-                      PreviewMouseWheel="ScrollViewer_MouseWheel"
                       PreviewKeyDown="ScrollViewer_PreviewKeyDown"
                       Grid.Column="1">
             <nodify:NodifyEditor x:Name="Editor"
diff --git a/Examples/Nodify.StateMachine/MainWindow.xaml.cs b/Examples/Nodify.StateMachine/MainWindow.xaml.cs
@@ -15,25 +15,7 @@ public MainWindow()
 
             EditorGestures.Mappings.Connection.Disconnect.Value = MultiGesture.None;
             EditorGestures.Mappings.Editor.ZoomModifierKey = ModifierKeys.Control;
-        }
-
-        private void ScrollViewer_MouseWheel(object sender, MouseWheelEventArgs e)
-        {
-            if (Keyboard.Modifiers != ModifierKeys.Shift)
-                return;
-
-            var scrollViewer = (ScrollViewer)sender;
-
-            if (e.Delta < 0)
-            {
-                scrollViewer.LineRight();
-            }
-            else
-            {
-                scrollViewer.LineLeft();
-            }
-
-            e.Handled = true;
+            EditorGestures.Mappings.Editor.PanWithMouseWheel = true;
         }
 
         private void ScrollViewer_PreviewKeyDown(object sender, KeyEventArgs e)
diff --git a/Nodify/EditorStates/ContainerDefaultState.cs b/Nodify/EditorStates/ContainerDefaultState.cs
@@ -44,7 +44,7 @@ public override void HandleMouseDown(MouseButtonEventArgs e)
         /// <inheritdoc />
         public override void HandleMouseMove(MouseEventArgs e)
         {
-            double dragThreshold = NodifyEditor.HandleRightClickAfterPanningThreshold * NodifyEditor.HandleRightClickAfterPanningThreshold;
+            double dragThreshold = NodifyEditor.MouseActionSuppressionThreshold * NodifyEditor.MouseActionSuppressionThreshold;
             double dragDistance = (Editor.MouseLocation - _initialPosition).LengthSquared;
 
             if (_isDragging && (dragDistance > dragThreshold))
@@ -64,7 +64,13 @@ public override void HandleMouseUp(MouseButtonEventArgs e)
         {
             if (_selectionType.HasValue)
             {
-                bool allowContextMenu = e.ChangedButton == MouseButton.Right && Container.IsSelected;
+                // Determine whether the current selection should remain intact or be replaced by the clicked item. 
+                // If the right mouse button is pressed on an already selected item, and the item either has an 
+                // explicit context menu or is configured to preserve the selection on right-click, the selection 
+                // remains unchanged. This ensures that the context menu applies to the entire selection rather 
+                // than only the clicked item.
+                bool hasContextMenu = Container.ContextMenu != null || ItemContainer.PreserveSelectionOnRightClick;
+                bool allowContextMenu = e.ChangedButton == MouseButton.Right && Container.IsSelected && hasContextMenu;
                 if (!(_selectionType == SelectionType.Replace && allowContextMenu))
                 {
                     Container.Select(_selectionType.Value);
diff --git a/Nodify/EditorStates/ContainerDraggingState.cs b/Nodify/EditorStates/ContainerDraggingState.cs
@@ -56,9 +56,9 @@ public override void HandleMouseUp(MouseButtonEventArgs e)
             if (gestures.Drag.Matches(e.Source, e))
             {
                 // Suppress the context menu if the mouse moved beyond the defined drag threshold
-                if (e.ChangedButton == MouseButton.Right)
+                if (e.ChangedButton == MouseButton.Right && Editor.ContextMenu != null)
                 {
-                    double dragThreshold = NodifyEditor.HandleRightClickAfterPanningThreshold * NodifyEditor.HandleRightClickAfterPanningThreshold;
+                    double dragThreshold = NodifyEditor.MouseActionSuppressionThreshold * NodifyEditor.MouseActionSuppressionThreshold;
                     double dragDistance = (Editor.MouseLocation - _initialMousePosition).LengthSquared;
 
                     if (dragDistance > dragThreshold)
diff --git a/Nodify/EditorStates/EditorCuttingState.cs b/Nodify/EditorStates/EditorCuttingState.cs
@@ -1,9 +1,11 @@
-﻿using System.Windows.Input;
+﻿using System.Windows;
+using System.Windows.Input;
 
 namespace Nodify
 {
     public class EditorCuttingState : EditorState
     {
+        private Point _initialPosition;
         private bool Canceled { get; set; } = CuttingLine.AllowCuttingCancellation;
 
         public EditorCuttingState(NodifyEditor editor) : base(editor)
@@ -14,7 +16,8 @@ public override void Enter(EditorState? from)
         {
             Canceled = false;
 
-            Editor.BeginCutting(Editor.MouseLocation);
+            _initialPosition = Editor.MouseLocation;
+            Editor.BeginCutting(_initialPosition);
         }
 
         public override void Exit()
@@ -35,6 +38,18 @@ public override void HandleMouseUp(MouseButtonEventArgs e)
             EditorGestures.NodifyEditorGestures gestures = EditorGestures.Mappings.Editor;
             if (gestures.Cutting.Matches(e.Source, e))
             {
+                // Suppress the context menu if the mouse moved beyond the defined drag threshold
+                if (e.ChangedButton == MouseButton.Right && Editor.ContextMenu != null)
+                {
+                    double dragThreshold = NodifyEditor.MouseActionSuppressionThreshold * NodifyEditor.MouseActionSuppressionThreshold;
+                    double dragDistance = (Editor.MouseLocation - _initialPosition).LengthSquared;
+
+                    if (dragDistance > dragThreshold)
+                    {
+                        e.Handled = true;
+                    }
+                }
+
                 PopState();
             }
             else if (CuttingLine.AllowCuttingCancellation && gestures.CancelAction.Matches(e.Source, e))
diff --git a/Nodify/EditorStates/EditorDefaultState.cs b/Nodify/EditorStates/EditorDefaultState.cs
@@ -1,4 +1,5 @@
-﻿using System.Windows;
+﻿using System;
+using System.Windows;
 using System.Windows.Input;
 
 namespace Nodify
@@ -53,18 +54,23 @@ public override void HandleMouseDown(MouseButtonEventArgs e)
         public override void HandleMouseWheel(MouseWheelEventArgs e)
         {
             EditorGestures.NodifyEditorGestures gestures = EditorGestures.Mappings.Editor;
-            if (gestures.PanWithMouseWheel)
+            if (gestures.PanWithMouseWheel && Keyboard.Modifiers == gestures.PanHorizontalModifierKey)
             {
-                if (Keyboard.Modifiers == gestures.PanHorizontalModifierKey)
-                {
-                    Editor.ViewportLocation = new Point(Editor.ViewportLocation.X - e.Delta / Editor.ViewportZoom, Editor.ViewportLocation.Y);
-                    e.Handled = true;
-                }
-                else if (Keyboard.Modifiers == gestures.PanVerticalModifierKey)
-                {
-                    Editor.ViewportLocation = new Point(Editor.ViewportLocation.X, Editor.ViewportLocation.Y - e.Delta / Editor.ViewportZoom);
-                    e.Handled = true;
-                }
+                double offset = Math.Sign(e.Delta) * Mouse.MouseWheelDeltaForOneLine / 2 / Editor.ViewportZoom;
+                Editor.UpdatePanning(new Vector(offset, 0d));
+                e.Handled = true;
+            }
+            else if (gestures.PanWithMouseWheel && Keyboard.Modifiers == gestures.PanVerticalModifierKey)
+            {
+                double offset = Math.Sign(e.Delta) * Mouse.MouseWheelDeltaForOneLine / 2 / Editor.ViewportZoom;
+                Editor.UpdatePanning(new Vector(0d, offset));
+                e.Handled = true;
+            }
+            else if (gestures.ZoomModifierKey == Keyboard.Modifiers)
+            {
+                double zoom = Math.Pow(2.0, e.Delta / 3.0 / Mouse.MouseWheelDeltaForOneLine);
+                Editor.ZoomAtPosition(zoom, Editor.MouseLocation);
+                e.Handled = true;
             }
         }
     }
diff --git a/Nodify/EditorStates/EditorPanningState.cs b/Nodify/EditorStates/EditorPanningState.cs
@@ -58,11 +58,13 @@ public override void HandleMouseUp(MouseButtonEventArgs e)
             EditorGestures.NodifyEditorGestures gestures = EditorGestures.Mappings.Editor;
             if (gestures.Pan.Matches(e.Source, e))
             {
-                // Handle right click if panning and moved the mouse more than threshold so context menu doesn't open
-                if (e.ChangedButton == MouseButton.Right)
+                // Suppress the context menu if the mouse moved beyond the defined drag threshold or the editor is selecting
+                if (e.ChangedButton == MouseButton.Right && Editor.ContextMenu != null)
                 {
-                    double contextMenuTreshold = NodifyEditor.HandleRightClickAfterPanningThreshold * NodifyEditor.HandleRightClickAfterPanningThreshold;
-                    if ((_currentMousePosition - _initialMousePosition).LengthSquared > contextMenuTreshold)
+                    double dragThreshold = NodifyEditor.MouseActionSuppressionThreshold * NodifyEditor.MouseActionSuppressionThreshold;
+                    double dragDistance = (_currentMousePosition - _initialMousePosition).LengthSquared;
+
+                    if (dragDistance > dragThreshold || Editor.IsSelecting)
                     {
                         e.Handled = true;
                     }
diff --git a/Nodify/EditorStates/EditorPushingItemsState.cs b/Nodify/EditorStates/EditorPushingItemsState.cs
@@ -8,7 +8,7 @@ namespace Nodify
     public class EditorPushingItemsState : EditorState
     {
         private Point _prevPosition;
-        private const int _minDragDistance = 10;
+        private Point _initialPosition;
 
         private bool Canceled { get; set; } = NodifyEditor.AllowPushItemsCancellation;
 
@@ -20,7 +20,8 @@ public override void Enter(EditorState? from)
         {
             Canceled = false;
 
-            _prevPosition = Editor.MouseLocation;
+            _initialPosition = Editor.MouseLocation;
+            _prevPosition = _initialPosition;
         }
 
         public override void Exit()
@@ -45,11 +46,11 @@ public override void HandleMouseMove(MouseEventArgs e)
             }
             else
             {
-                if (Math.Abs(Editor.MouseLocation.X - _prevPosition.X) >= _minDragDistance)
+                if (Math.Abs(Editor.MouseLocation.X - _prevPosition.X) >= NodifyEditor.MouseActionSuppressionThreshold)
                 {
                     Editor.BeginPushingItems(_prevPosition, Orientation.Horizontal);
                 }
-                else if (Math.Abs(Editor.MouseLocation.Y - _prevPosition.Y) >= _minDragDistance)
+                else if (Math.Abs(Editor.MouseLocation.Y - _prevPosition.Y) >= NodifyEditor.MouseActionSuppressionThreshold)
                 {
                     Editor.BeginPushingItems(_prevPosition, Orientation.Vertical);
                 }
@@ -61,6 +62,18 @@ public override void HandleMouseUp(MouseButtonEventArgs e)
             EditorGestures.NodifyEditorGestures gestures = EditorGestures.Mappings.Editor;
             if (gestures.PushItems.Matches(e.Source, e))
             {
+                // Suppress the context menu if the mouse moved beyond the defined drag threshold
+                if (e.ChangedButton == MouseButton.Right && Editor.ContextMenu != null)
+                {
+                    double dragThreshold = NodifyEditor.MouseActionSuppressionThreshold * NodifyEditor.MouseActionSuppressionThreshold;
+                    double dragDistance = (Editor.MouseLocation - _initialPosition).LengthSquared;
+
+                    if (dragDistance > dragThreshold)
+                    {
+                        e.Handled = true;
+                    }
+                }
+
                 PopState();
             }
             else if (NodifyEditor.AllowPushItemsCancellation && gestures.CancelAction.Matches(e.Source, e))
diff --git a/Nodify/EditorStates/EditorSelectingState.cs b/Nodify/EditorStates/EditorSelectingState.cs
@@ -1,10 +1,12 @@
-﻿using System.Windows.Input;
+﻿using System.Windows;
+using System.Windows.Input;
 
 namespace Nodify
 {
     /// <summary>The selecting state of the editor.</summary>
     public class EditorSelectingState : EditorState
     {
+        private Point _initialPosition;
         private readonly SelectionType _type;
         private bool Canceled { get; set; } = NodifyEditor.AllowSelectionCancellation;
 
@@ -21,7 +23,8 @@ public override void Enter(EditorState? from)
         {
             Canceled = false;
 
-            Editor.BeginSelecting(Editor.MouseLocation, _type);
+            _initialPosition = Editor.MouseLocation;
+            Editor.BeginSelecting(_initialPosition, _type);
         }
 
         /// <inheritdoc />
@@ -39,7 +42,7 @@ public override void Exit()
         }
 
         /// <inheritdoc />
-        public override void HandleMouseMove(MouseEventArgs e) 
+        public override void HandleMouseMove(MouseEventArgs e)
             => Editor.UpdateSelection(Editor.MouseLocation);
 
         /// <inheritdoc />
@@ -55,11 +58,23 @@ public override void HandleMouseDown(MouseButtonEventArgs e)
         public override void HandleMouseUp(MouseButtonEventArgs e)
         {
             EditorGestures.SelectionGestures gestures = EditorGestures.Mappings.Editor.Selection;
-            if(gestures.Select.Matches(e.Source, e))
+            if (gestures.Select.Matches(e.Source, e))
             {
+                // Suppress the context menu if the mouse moved beyond the defined drag threshold
+                if (e.ChangedButton == MouseButton.Right && Editor.ContextMenu != null)
+                {
+                    double dragThreshold = NodifyEditor.MouseActionSuppressionThreshold * NodifyEditor.MouseActionSuppressionThreshold;
+                    double dragDistance = (Editor.MouseLocation - _initialPosition).LengthSquared;
+
+                    if (dragDistance > dragThreshold)
+                    {
+                        e.Handled = true;
+                    }
+                }
+
                 PopState();
             }
-            else if(NodifyEditor.AllowSelectionCancellation && gestures.Cancel.Matches(e.Source, e))
+            else if (NodifyEditor.AllowSelectionCancellation && gestures.Cancel.Matches(e.Source, e))
             {
                 Canceled = true;
                 e.Handled = true;   // prevents opening context menu
diff --git a/Nodify/ItemContainer.cs b/Nodify/ItemContainer.cs
@@ -221,6 +221,12 @@ private static void OnIsSelectedChanged(DependencyObject d, DependencyPropertyCh
         /// </summary>
         public static bool AllowDraggingCancellation { get; set; } = true;
 
+        /// <summary>
+        /// Indicates whether right-click on the container should preserve the current selection. 
+        /// </summary>
+        /// <remarks>Has no effect if the container has a context menu.</remarks>
+        public static bool PreserveSelectionOnRightClick { get; set; }
+
         /// <summary>
         /// The <see cref="NodifyEditor"/> that owns this <see cref="ItemContainer"/>.
         /// </summary>
diff --git a/Nodify/NodifyEditor.Panning.cs b/Nodify/NodifyEditor.Panning.cs
@@ -75,12 +75,6 @@ public bool IsPanning
         /// </summary>
         public static bool AllowPanningCancellation { get; set; }
 
-        /// <summary>
-        /// Gets or sets the maximum number of pixels allowed to move the mouse before cancelling the mouse event.
-        /// Useful for <see cref="ContextMenu"/>s to appear if mouse only moved a bit or not at all.
-        /// </summary>
-        public static double HandleRightClickAfterPanningThreshold { get; set; } = 12d;
-
         /// <summary>
         /// Gets or sets how often the new <see cref="ViewportLocation"/> is calculated in milliseconds when <see cref="DisableAutoPanning"/> is false.
         /// </summary>
@@ -119,11 +113,9 @@ public void BeginPanning()
         /// <param name="amount">The amount to pan the viewport.</param>
         /// <remarks>
         /// This method adjusts the current <see cref="ViewportLocation"/> incrementally based on the provided amount.
-        /// It should only be called while a panning operation is active (see <see cref="BeginPanning(Point)"/>).
         /// </remarks>
         public void UpdatePanning(Vector amount)
         {
-            Debug.Assert(IsPanning);
             ViewportLocation -= amount;
         }
 
diff --git a/Nodify/NodifyEditor.Scrolling.cs b/Nodify/NodifyEditor.Scrolling.cs
@@ -85,13 +85,13 @@ Rect IScrollInfo.MakeVisible(Visual visual, Rect rectangle)
 
         void IScrollInfo.SetHorizontalOffset(double offset)
         {
-            _horizontalOffset = offset;
+            _horizontalOffset = double.IsInfinity(offset) ? 0d : offset;
             UpdateViewportLocationOnScroll();
         }
 
         void IScrollInfo.SetVerticalOffset(double offset)
         {
-            _verticalOffset = offset;
+            _verticalOffset = double.IsInfinity(offset) ? 0d : offset;
             UpdateViewportLocationOnScroll();
         }
 
diff --git a/Nodify/NodifyEditor.cs b/Nodify/NodifyEditor.cs

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public static List<BlackboardItemReferenceViewModel> GetAvailableItems<T>()`
`128`	`128`	`for (int i = 0; i < types.Length; i++)`
`129`	`129`	`{`
`130`	`130`	`var type = types[i];`
`131`		`- if (type.IsClass && !type.IsAbstract && ourType.IsAssignableFrom(type))`
	`131`	`+ if (type.IsClass && !type.IsAbstract && ourType.IsAssignableFrom(type) && type.GetCustomAttribute<BlackboardItemAttribute>() != null)`
`132`	`132`	`{`
`133`	`133`	`result.Add(GetReference(type));`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public override void HandleMouseDown(MouseButtonEventArgs e)`
`44`	`44`	`/// <inheritdoc />`
`45`	`45`	`public override void HandleMouseMove(MouseEventArgs e)`
`46`	`46`	`{`
`47`		`- double dragThreshold = NodifyEditor.HandleRightClickAfterPanningThreshold * NodifyEditor.HandleRightClickAfterPanningThreshold;`
	`47`	`+ double dragThreshold = NodifyEditor.MouseActionSuppressionThreshold * NodifyEditor.MouseActionSuppressionThreshold;`
`48`	`48`	`double dragDistance = (Editor.MouseLocation - _initialPosition).LengthSquared;`
`49`	`49`
`50`	`50`	`if (_isDragging && (dragDistance > dragThreshold))`
`@@ -64,7 +64,13 @@ public override void HandleMouseUp(MouseButtonEventArgs e)`
`64`	`64`	`{`
`65`	`65`	`if (_selectionType.HasValue)`
`66`	`66`	`{`
`67`		`- bool allowContextMenu = e.ChangedButton == MouseButton.Right && Container.IsSelected;`
	`67`	`+ // Determine whether the current selection should remain intact or be replaced by the clicked item.`
	`68`	`+ // If the right mouse button is pressed on an already selected item, and the item either has an`
	`69`	`+ // explicit context menu or is configured to preserve the selection on right-click, the selection`
	`70`	`+ // remains unchanged. This ensures that the context menu applies to the entire selection rather`
	`71`	`+ // than only the clicked item.`
	`72`	`+ bool hasContextMenu = Container.ContextMenu != null \|\| ItemContainer.PreserveSelectionOnRightClick;`
	`73`	`+ bool allowContextMenu = e.ChangedButton == MouseButton.Right && Container.IsSelected && hasContextMenu;`
`68`	`74`	`if (!(_selectionType == SelectionType.Replace && allowContextMenu))`
`69`	`75`	`{`
`70`	`76`	`Container.Select(_selectionType.Value);`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,9 @@ public override void HandleMouseUp(MouseButtonEventArgs e)`
`56`	`56`	`if (gestures.Drag.Matches(e.Source, e))`
`57`	`57`	`{`
`58`	`58`	`// Suppress the context menu if the mouse moved beyond the defined drag threshold`
`59`		`- if (e.ChangedButton == MouseButton.Right)`
	`59`	`+ if (e.ChangedButton == MouseButton.Right && Editor.ContextMenu != null)`
`60`	`60`	`{`
`61`		`- double dragThreshold = NodifyEditor.HandleRightClickAfterPanningThreshold * NodifyEditor.HandleRightClickAfterPanningThreshold;`
	`61`	`+ double dragThreshold = NodifyEditor.MouseActionSuppressionThreshold * NodifyEditor.MouseActionSuppressionThreshold;`
`62`	`62`	`double dragDistance = (Editor.MouseLocation - _initialMousePosition).LengthSquared;`
`63`	`63`
`64`	`64`	`if (dragDistance > dragThreshold)`
Original file line number	Diff line number	Diff line change
`@@ -58,11 +58,13 @@ public override void HandleMouseUp(MouseButtonEventArgs e)`
`58`	`58`	`EditorGestures.NodifyEditorGestures gestures = EditorGestures.Mappings.Editor;`
`59`	`59`	`if (gestures.Pan.Matches(e.Source, e))`
`60`	`60`	`{`
`61`		`- // Handle right click if panning and moved the mouse more than threshold so context menu doesn't open`
`62`		`- if (e.ChangedButton == MouseButton.Right)`
	`61`	`+ // Suppress the context menu if the mouse moved beyond the defined drag threshold or the editor is selecting`
	`62`	`+ if (e.ChangedButton == MouseButton.Right && Editor.ContextMenu != null)`
`63`	`63`	`{`
`64`		`- double contextMenuTreshold = NodifyEditor.HandleRightClickAfterPanningThreshold * NodifyEditor.HandleRightClickAfterPanningThreshold;`
`65`		`- if ((_currentMousePosition - _initialMousePosition).LengthSquared > contextMenuTreshold)`
	`64`	`+ double dragThreshold = NodifyEditor.MouseActionSuppressionThreshold * NodifyEditor.MouseActionSuppressionThreshold;`
	`65`	`+ double dragDistance = (_currentMousePosition - _initialMousePosition).LengthSquared;`
	`66`	`+`
	`67`	`+ if (dragDistance > dragThreshold \|\| Editor.IsSelecting)`
`66`	`68`	`{`
`67`	`69`	`e.Handled = true;`
`68`	`70`	`}`