[DYN-7839] Wires & Pins: improve snapping tolerance (#15683)

ivaylo-matov · web-flow · commit 6b5f430475c6 · 2024-12-04T08:00:37.000-08:00
diff --git a/src/DynamoCore/Configuration/Configurations.cs b/src/DynamoCore/Configuration/Configurations.cs
@@ -58,6 +58,16 @@ public class Configurations
         /// </summary>
         public static readonly double ZoomToFitPaddingFactor = 3.5;
 
+        /// <summary>
+        /// Const used to define the interaction or hit area thickness for connectors in the workspace.
+        /// </summary>
+        public static readonly double ConnectorBaseThickness = 3;
+
+        /// <summary>
+        /// Const defining the scaling factor for adjusting connector stroke thickness based on zoom level.
+        /// </summary>
+        public const double ConnectorZoomScalingFactor = 2.0;
+
         #endregion
 
         #region Usage Reporting Error Message
diff --git a/src/DynamoCore/PublicAPI.Unshipped.txt b/src/DynamoCore/PublicAPI.Unshipped.txt
@@ -36,6 +36,7 @@ abstract Dynamo.Search.SearchElements.SearchElementBase.Type.get -> string
 abstract Dynamo.Search.SearchElements.SearchElementBase.Weight.get -> double
 abstract Dynamo.Search.SearchElements.SearchElementBase.Weight.set -> void
 const Dynamo.Configuration.Configurations.NotificationsDefaultTimeOut = 10000 -> int
+const Dynamo.Configuration.Configurations.ConnectorZoomScalingFactor = 2 -> double
 const Dynamo.Configuration.Context.NONE = "None" -> string
 const Dynamo.Configuration.Context.REVIT_2014 = "Revit 2014" -> string
 const Dynamo.Configuration.Context.REVIT_2015 = "Revit 2015" -> string
@@ -3001,6 +3002,7 @@ static readonly Dynamo.Configuration.Configurations.AutodeskAsString -> string
 static readonly Dynamo.Configuration.Configurations.BackupFolderName -> string
 static readonly Dynamo.Configuration.Configurations.CBNMaxPortNameLength -> int
 static readonly Dynamo.Configuration.Configurations.CodeBlockOutputPortHeightInPixels -> double
+static readonly Dynamo.Configuration.Configurations.ConnectorBaseThickness -> double
 static readonly Dynamo.Configuration.Configurations.DoubleSliderTextBoxWidth -> double
 static readonly Dynamo.Configuration.Configurations.DynamoAsString -> string
 static readonly Dynamo.Configuration.Configurations.DynamoNodeHelpDocs -> string
diff --git a/src/DynamoCoreWpf/PublicAPI.Unshipped.txt b/src/DynamoCoreWpf/PublicAPI.Unshipped.txt
@@ -1723,6 +1723,7 @@ Dynamo.ViewModels.CompactBubbleViewModel.ShowNumberOfItems.get -> bool
 Dynamo.ViewModels.CompactBubbleViewModel.ValueType.get -> string
 Dynamo.ViewModels.CompactBubbleViewModel.ValueType.set -> void
 Dynamo.ViewModels.ConnectorAnchorViewModel
+Dynamo.ViewModels.ConnectorAnchorViewModel.AnchorOffset.get -> double
 Dynamo.ViewModels.ConnectorAnchorViewModel.AnchorSize.get -> double
 Dynamo.ViewModels.ConnectorAnchorViewModel.AnchorSize.set -> void
 Dynamo.ViewModels.ConnectorAnchorViewModel.CanDisplayIcons.get -> bool
@@ -1740,6 +1741,8 @@ Dynamo.ViewModels.ConnectorAnchorViewModel.IsHalftone.get -> bool
 Dynamo.ViewModels.ConnectorAnchorViewModel.IsHalftone.set -> void
 Dynamo.ViewModels.ConnectorAnchorViewModel.IsTemporarilyDisplayed.get -> bool
 Dynamo.ViewModels.ConnectorAnchorViewModel.IsTemporarilyDisplayed.set -> void
+Dynamo.ViewModels.ConnectorAnchorViewModel.MarkerOffsetY.get -> double
+Dynamo.ViewModels.ConnectorAnchorViewModel.MarkerOffsetX.get -> double
 Dynamo.ViewModels.ConnectorAnchorViewModel.MarkerSize.get -> double
 Dynamo.ViewModels.ConnectorAnchorViewModel.MarkerSize.set -> void
 Dynamo.ViewModels.ConnectorAnchorViewModel.PinConnectorCommand.get -> Dynamo.UI.Commands.DelegateCommand
@@ -1749,6 +1752,8 @@ Dynamo.ViewModels.ConnectorAnchorViewModel.PinIconPreviewOn.set -> void
 Dynamo.ViewModels.ConnectorAnchorViewModel.PlaceWatchNodeCommand.get -> Dynamo.UI.Commands.DelegateCommand
 Dynamo.ViewModels.ConnectorAnchorViewModel.PlaceWatchNodeCommand.set -> void
 Dynamo.ViewModels.ConnectorAnchorViewModel.RequestDispose -> System.EventHandler
+Dynamo.ViewModels.ConnectorAnchorViewModel.ScaledAnchorSize.get -> double
+Dynamo.ViewModels.ConnectorAnchorViewModel.ScaledMarkerSize.get -> double
 Dynamo.ViewModels.ConnectorAnchorViewModel.WatchIconPreviewOn.get -> bool
 Dynamo.ViewModels.ConnectorAnchorViewModel.WatchIconPreviewOn.set -> void
 Dynamo.ViewModels.ConnectorContextMenuViewModel
@@ -1832,6 +1837,8 @@ Dynamo.ViewModels.ConnectorViewModel.DotLeft.get -> double
 Dynamo.ViewModels.ConnectorViewModel.DotLeft.set -> void
 Dynamo.ViewModels.ConnectorViewModel.DotTop.get -> double
 Dynamo.ViewModels.ConnectorViewModel.DotTop.set -> void
+Dynamo.ViewModels.ConnectorViewModel.DynamicStrokeThickness.get -> double
+Dynamo.ViewModels.ConnectorViewModel.DynamicStrokeThickness.set -> void
 Dynamo.ViewModels.ConnectorViewModel.EndDotSize.get -> double
 Dynamo.ViewModels.ConnectorViewModel.EndDotSize.set -> void
 Dynamo.ViewModels.ConnectorViewModel.GoToEndNodeCommand.get -> Dynamo.UI.Commands.DelegateCommand
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/Connectors.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/Connectors.xaml
@@ -5,7 +5,8 @@
                       xmlns:i="clr-namespace:Dynamo.Microsoft.Xaml.Behaviors;assembly=Dynamo.Microsoft.Xaml.Behaviors"
                       xmlns:views="clr-namespace:Dynamo.Controls;assembly=DynamoCoreWpf"
                       xmlns:nodes="clr-namespace:Dynamo.Nodes;assembly=DynamoCoreWpf"
-                      xmlns:mouse="clr-namespace:Dynamo.Wpf.UI;assembly=DynamoCoreWpf">
+                      xmlns:mouse="clr-namespace:Dynamo.Wpf.UI;assembly=DynamoCoreWpf"
+                      xmlns:configuration="clr-namespace:Dynamo.Configuration;assembly=DynamoCore">
 
     <ResourceDictionary.MergedDictionaries>
         <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoConvertersDictionaryUri}" />
@@ -126,10 +127,15 @@
             </Canvas>
 
             <!--Bezier Path-->
-            <Path Stroke="{DynamicResource BConnectorSelection}" StrokeThickness="3"
+            <Path Stroke="{DynamicResource BConnectorSelection}" StrokeThickness="{Binding Source={x:Static configuration:Configurations.ConnectorBaseThickness}}"
               Name="connector"
               Visibility="{Binding IsCollapsed, Converter={StaticResource InverseBoolToVisibilityCollapsedConverter}, UpdateSourceTrigger=PropertyChanged}" 
-              Style="{StaticResource SConnector}" Canvas.ZIndex="-1" 
+              Style="{StaticResource SConnector}" Canvas.ZIndex="-2" 
+                  Data="{Binding ComputedBezierPathGeometry, UpdateSourceTrigger=PropertyChanged}">
+            </Path>
+            <Path Stroke="Transparent" StrokeThickness="{Binding DynamicStrokeThickness}"
+                  Visibility="{Binding IsCollapsed, Converter={StaticResource InverseBoolToVisibilityCollapsedConverter}, UpdateSourceTrigger=PropertyChanged}"
+                  Style="{StaticResource SConnector}" Canvas.ZIndex="-1"
                   Data="{Binding ComputedBezierPathGeometry, UpdateSourceTrigger=PropertyChanged}">
                 <i:Interaction.Behaviors>
                     <mouse:MouseBehaviour MouseX="{Binding PanelX, Mode=OneWayToSource, UpdateSourceTrigger=PropertyChanged}" MouseY="{Binding PanelY, Mode=OneWayToSource,  UpdateSourceTrigger=PropertyChanged}" />
diff --git a/src/DynamoCoreWpf/ViewModels/Core/ConnectorViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/ConnectorViewModel.cs
@@ -8,6 +8,7 @@
 using System.Windows.Media;
 using System.Windows.Shapes;
 using System.Windows.Threading;
+using Dynamo.Configuration;
 using Dynamo.Graph;
 using Dynamo.Graph.Connectors;
 using Dynamo.Graph.Nodes;
@@ -48,6 +49,7 @@ public partial class ConnectorViewModel : ViewModelBase
         private double dotLeft;
         private double endDotSize = 6;
         private double zIndex = 3;
+        private double dynamicStrokeThickness;
 
         private Point curvePoint1;
         private Point curvePoint2;
@@ -568,6 +570,16 @@ public PathGeometry ComputedBezierPathGeometry
             }
         }
 
+        public double DynamicStrokeThickness
+        {
+            get => dynamicStrokeThickness;
+            set
+            {
+                dynamicStrokeThickness = value;
+                RaisePropertyChanged(nameof(DynamicStrokeThickness));
+            }
+        }
+
         #endregion
 
         /// <summary>
@@ -959,13 +971,15 @@ public ConnectorViewModel(WorkspaceViewModel workspace, PortModel port)
             this.workspaceViewModel = workspace;
             ConnectorPinViewCollection = new ObservableCollection<ConnectorPinViewModel>();
             ConnectorPinViewCollection.CollectionChanged += HandleCollectionChanged;
+            workspaceViewModel.PropertyChanged += WorkspaceViewModel_PropertyChanged;
 
             IsHidden = !workspaceViewModel.DynamoViewModel.IsShowingConnectors;
             IsConnecting = true;
             MouseHoverOn = false;
             activeStartPort = port;
             ZIndex = SetZIndex();
 
+            UpdateDynamicStrokeThickness();
             Redraw(port.Center);
 
             InitializeCommands();
@@ -1001,6 +1015,7 @@ public ConnectorViewModel(WorkspaceViewModel workspace, ConnectorModel connector
 
             ConnectorPinViewCollection = new ObservableCollection<ConnectorPinViewModel>();
             ConnectorPinViewCollection.CollectionChanged += HandleCollectionChanged;
+            workspaceViewModel.PropertyChanged += WorkspaceViewModel_PropertyChanged;
 
 
             if (connectorModel.ConnectorPinModels != null)
@@ -1028,6 +1043,7 @@ public ConnectorViewModel(WorkspaceViewModel workspace, ConnectorModel connector
                 NodeEnd.PropertyChanged += nodeEndViewModel_PropertyChanged;
             }
             
+            UpdateDynamicStrokeThickness();
             Redraw();
             InitializeCommands();
 
@@ -1164,6 +1180,24 @@ private void HandleCollectionChanged(object sender, NotifyCollectionChangedEvent
             Redraw();
         }
 
+        private void WorkspaceViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(workspaceViewModel.Zoom))
+            {
+                UpdateDynamicStrokeThickness();
+            }
+        }
+
+        private void UpdateDynamicStrokeThickness()
+        {
+            DynamicStrokeThickness = Math.Max(
+                Configurations.ConnectorBaseThickness,
+                Configurations.ConnectorBaseThickness *
+                (1 / workspaceViewModel.Zoom) *
+                Configurations.ConnectorZoomScalingFactor
+            );
+        }
+
         /// <summary>
         /// Dispose function
         /// </summary>
@@ -1190,6 +1224,8 @@ public override void Dispose()
             }
             ConnectorPinViewCollection.CollectionChanged -= HandleCollectionChanged;
 
+            workspaceViewModel.PropertyChanged -= WorkspaceViewModel_PropertyChanged;
+
             foreach (var pin in ConnectorPinViewCollection.ToList())
             {
                 pin.RequestRedraw -= HandlerRedrawRequest;
diff --git a/src/DynamoCoreWpf/ViewModels/Preview/ConnectorAnchorViewModel.cs b/src/DynamoCoreWpf/ViewModels/Preview/ConnectorAnchorViewModel.cs
@@ -18,6 +18,7 @@ namespace Dynamo.ViewModels
     public class ConnectorAnchorViewModel: ViewModelBase
     {
         #region Properties 
+        private WorkspaceViewModel WorkspaceViewModel { get; }
         private Point currentPosition;
         private bool isHalftone;
         private bool isTemporarilyVisible = false;
@@ -29,16 +30,42 @@ public class ConnectorAnchorViewModel: ViewModelBase
         private bool pinIconPreviewOn = false;
         private string dataTooltipText;
 
+        private double? cachedZoom = null;
+        private Dictionary<double, double> cachedSizes = new Dictionary<double, double>();
+
         private ConnectorViewModel ViewModel { get; set; }
         private DynamoModel DynamoModel { get; set; }
         private DynamoViewModel DynamoViewModel { get; set; }
         private Dispatcher Dispatcher { get; set; }
 
         /// <summary>
-        /// The size of the Watch Icon (x &amp; y dimensions).
+        /// The size of the Watch and Pin icons (x &amp; y dimensions).
         /// </summary>
         public double MarkerSize { get; set; } = 30;
+        /// <summary>
+        /// The scaled size of the Watch and Pin icons (x &amp; y dimensions).
+        /// </summary>
+        public double ScaledMarkerSize => GetCachedScaledSize(MarkerSize);
+        /// <summary>
+        /// The size of the anchor button (x and y dimensions).
+        /// </summary>
         public double AnchorSize { get; set; } = 15;
+        /// <summary>
+        /// The scaled size of the anchor button (x and y dimensions).
+        /// </summary>
+        public double ScaledAnchorSize => GetCachedScaledSize(AnchorSize);
+        /// <summary>
+        /// The offset for the anchor button, calculated as half the size.
+        /// </summary>
+        public double AnchorOffset => ScaledAnchorSize / -2;
+        /// <summary>
+        /// The vertical offset for the Watch and Pin buttons.
+        /// </summary>
+        public double MarkerOffsetY => GetCachedScaledSize(-37);
+        /// <summary>
+        /// The horizontal offset for the Pin button.
+        /// </summary>
+        public double MarkerOffsetX => GetCachedScaledSize(-30);
 
         /// <summary>
         /// Midpoint of the connector bezier curve.
@@ -165,7 +192,7 @@ public bool CanShowTooltip
 
         /// <summary>
         /// This property acts as the main flag that signals whether or not watch icon/pin icon/tooltip
-        /// should be visibile/ hidden.
+        /// should be visible/ hidden.
         /// </summary>
         public bool CanDisplayIcons
         {
@@ -284,6 +311,7 @@ public ConnectorAnchorViewModel(ConnectorViewModel connectorViewModel,
             ViewModel = connectorViewModel;
             DynamoViewModel = dynamoViewModel;
             DynamoModel = DynamoViewModel.Model;
+            WorkspaceViewModel = dynamoViewModel.CurrentSpaceViewModel;
             DataToolTipText = tooltipText;
             InitCommands();
 
@@ -417,5 +445,48 @@ private int ConnectorSegmentIndex(Point midPoint, Point connectorLocation)
         {
             return midPoint.X > connectorLocation.X ? 0 : 1;
         }
+
+        /// <summary>
+        /// Calculates a scaled size based on the zoom level, applying a non-linear decay.
+        /// Ensures the size decreases monotonically and approaches a minimum size as zoom decreases.
+        /// </summary>
+        private double CalculateScaledSize(double defaultSize)
+        {
+            // Proportion for the minimum size relative to defaultSize
+            const double resizingFactor = 0.5;
+            // Controls the rate of size decay for lower zoom levels
+            const double curveSteepness = 1.5;
+
+            double minSize = defaultSize * resizingFactor;
+
+            if (WorkspaceViewModel.Zoom >= 1)
+            {
+                return defaultSize;
+            }
+
+            // Apply non-linear decay formula
+            double zoomFactor = Math.Pow(WorkspaceViewModel.Zoom, curveSteepness);
+            return (minSize + (defaultSize - minSize) * zoomFactor) / WorkspaceViewModel.Zoom;
+        }
+
+        /// <summary>
+        /// Retrieves a scaled size from the cache or calculates it if the Zoom level has changed or the size is not cached.
+        /// </summary>
+        private double GetCachedScaledSize(double defaultSize)
+        {
+            if (cachedZoom != WorkspaceViewModel.Zoom)
+            {
+                cachedSizes.Clear();
+                cachedZoom = WorkspaceViewModel.Zoom;
+            }
+
+            if (!cachedSizes.TryGetValue(defaultSize, out var scaledSize))
+            {
+                scaledSize = CalculateScaledSize(defaultSize);
+                cachedSizes[defaultSize] = scaledSize;
+            }
+
+            return scaledSize;
+        }
     }
 }
diff --git a/src/DynamoCoreWpf/Views/Core/ConnectorAnchorView.xaml b/src/DynamoCoreWpf/Views/Core/ConnectorAnchorView.xaml
@@ -1,4 +1,4 @@
-﻿<UserControl x:Class="Dynamo.Controls.ConnectorAnchorView"
+<UserControl x:Class="Dynamo.Controls.ConnectorAnchorView"
              xmlns="https://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="https://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="https://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -64,8 +64,8 @@
                 x:Name="AnchorButton"
                 Canvas.Top="{Binding CurrentPosition.Y}"
                 Canvas.Left="{Binding CurrentPosition.X}"
-                Height="{Binding AnchorSize}"
-                Width="{Binding AnchorSize}"
+                Height="{Binding ScaledAnchorSize}"
+                Width="{Binding ScaledAnchorSize}"
                 ToolTipService.ShowDuration="{x:Static Member=System:Int32.MaxValue}">
             <Button.ToolTip>
                 <ToolTip Style="{StaticResource ConnectorTooltip}"
@@ -95,7 +95,7 @@
                 </Image>
             </StackPanel>
             <Button.RenderTransform>
-                <TranslateTransform X="-7.5" Y="-7.5" />
+                <TranslateTransform X="{Binding AnchorOffset}" Y="{Binding AnchorOffset}" />
             </Button.RenderTransform>
         </Button>
 
@@ -104,8 +104,8 @@
                 Style="{StaticResource TransparentButtonWithTriggers}"
                 Canvas.Top="{Binding CurrentPosition.Y}"
                 Canvas.Left="{Binding CurrentPosition.X}"
-                Height="{Binding MarkerSize}"
-                Width="{Binding MarkerSize}"
+                Height="{Binding ScaledMarkerSize}"
+                Width="{Binding ScaledMarkerSize}"
                 Command="{Binding PlaceWatchNodeCommand}"
                 MouseEnter="OnWatchIconHover"
                 MouseLeave="OnWatchIconUnhover">
@@ -129,16 +129,16 @@
                 </Image>
             </StackPanel>
             <Button.RenderTransform>
-                <TranslateTransform X="0" Y="-37" />
+                <TranslateTransform X="0" Y="{Binding MarkerOffsetY}" />
             </Button.RenderTransform>
         </Button>
         <!--pin icon-->
         <Button x:Name="PinIconButton"
                 Style="{StaticResource TransparentButtonWithTriggers}"
                 Canvas.Top="{Binding CurrentPosition.Y}"
                 Canvas.Left="{Binding CurrentPosition.X}"
-                Height="{Binding MarkerSize}"
-                Width="{Binding MarkerSize}"
+                Height="{Binding ScaledMarkerSize}"
+                Width="{Binding ScaledMarkerSize}"
                 Command="{Binding PinConnectorCommand}"
                 MouseEnter="OnPinIconHover"
                 MouseLeave="OnPinIconUnhover">
@@ -162,7 +162,7 @@
                 </Image>
             </StackPanel>
             <Button.RenderTransform>
-                <TranslateTransform X="-30" Y="-37" />
+                <TranslateTransform X="{Binding MarkerOffsetX}" Y="{Binding MarkerOffsetY}" />
             </Button.RenderTransform>
         </Button>
     </Canvas>
