Merge remote-tracking branch 'upstream/master' into avalonia_port

CHANGELOG.md

@@ -6,6 +6,15 @@
 > - Features:
 > - Bugfixes:
 
+#### **Version 6.3.0**
+
+> - Features:
+>	- Added a CuttingLine control that removes intersecting connections
+>	- Added CuttingLineStyle, CuttingStartedCommand, CuttingCompletedCommand, IsCutting, EnableCuttingLinePreview and CuttingConnectionTypes to NodifyEditor
+>	- Added EditorGestures.Editor.Cutting and EditorGestures.Editor.CancelAction
+> - Bugfixes:
+>	- Fixed connection styles not inheriting from the BaseConnection style
+
 #### **Version 6.2.0**
 
 > - Features:

Examples/Nodify.Calculator/MainWindow.xaml.cs

@@ -1,5 +1,4 @@
 using System.Windows;
-using System.Windows.Input;
 
 namespace Nodify.Calculator
 {
@@ -8,6 +7,8 @@ public partial class MainWindow : Window
         public MainWindow()
         {
             InitializeComponent();
+
+            EditorGestures.Mappings.Editor.Cutting.Value = MultiGesture.None;
         }
     }
 }

Examples/Nodify.Playground/Editor/NodifyEditorView.xaml

@@ -44,6 +44,8 @@
         <SolidColorBrush x:Key="SquareConnectorColor" Color="MediumSlateBlue" />
         <SolidColorBrush x:Key="TriangleConnectorColor" Color="MediumVioletRed" />
 
+        <!-- <UIElement x:Key="ConnectionAnimationPlaceholder" Opacity="1" /> -->
+
         <!-- <Storyboard x:Key="HighlightConnection"> -->
         <!--     <DoubleAnimation Storyboard.TargetProperty="StrokeThickness"  -->
         <!--                      Duration="0:0:0.3" From="3" To="6"  /> -->
@@ -52,7 +54,8 @@
         <!--                      Duration="0:0:0.3" From="1" To="0.3"  /> -->
         <!-- </Storyboard> -->
 
-        <ControlTheme x:Key="ConnectionStyle" TargetType="{x:Type nodify:BaseConnection}">
+        <ControlTheme x:Key="ConnectionStyle" TargetType="{x:Type nodify:BaseConnection}"
+               BasedOn="{StaticResource {x:Type nodify:BaseConnection}}">
             <Setter Property="(Interaction.Behaviors)">
                 <BehaviorCollectionTemplate>
                     <BehaviorCollection>
@@ -166,6 +169,15 @@
                 </BehaviorCollectionTemplate>
             </Setter>
         </ControlTheme>
+
+        <ControlTheme x:Key="CuttingLineStyle"
+               TargetType="{x:Type nodify:CuttingLine}"
+               BasedOn="{StaticResource {x:Type nodify:CuttingLine}}">
+            <Setter Property="StrokeDashArray"
+                    Value="1,1" />
+            <Setter Property="StrokeThickness"
+                    Value="2" />
+        </ControlTheme>
     </UserControl.Resources>
 
     <Grid>
@@ -190,7 +202,8 @@
                              DisplayConnectionsOnTop="{Binding DisplayConnectionsOnTop, Source={x:Static local:EditorSettings.Instance}}"
                              BringIntoViewSpeed="{Binding BringIntoViewSpeed, Source={x:Static local:EditorSettings.Instance}}"
                              BringIntoViewMaxDuration="{Binding BringIntoViewMaxDuration, Source={x:Static local:EditorSettings.Instance}}"
-                             SelectionRectangleStyle="{StaticResource SelectionRectangleStyle}">
+                             SelectionRectangleStyle="{StaticResource SelectionRectangleStyle}"
+                             CuttingLineStyle="{StaticResource CuttingLineStyle}">
             <nodify:NodifyEditor.Theme>
                 <ControlTheme TargetType="{x:Type nodify:NodifyEditor}"
                        BasedOn="{StaticResource {x:Type nodify:NodifyEditor}}">

Examples/Nodify.Playground/EditorInputMode.cs

@@ -6,7 +6,8 @@ public enum EditorInputMode
     {
         Default,
         PanOnly,
-        SelectOnly
+        SelectOnly,
+        CutOnly
     }
 
     public enum EditorGesturesMappings
@@ -25,12 +26,22 @@ public static void Apply(this EditorGestures mappings, EditorInputMode inputMode
             {
                 case EditorInputMode.PanOnly:
                     mappings.Editor.Selection.Apply(EditorGestures.SelectionGestures.None);
+                    mappings.Editor.Cutting.Value = MultiGesture.None;
                     mappings.ItemContainer.Selection.Apply(EditorGestures.SelectionGestures.None);
                     mappings.ItemContainer.Drag.Value = MultiGesture.None;
                     mappings.Connector.Connect.Value = MultiGesture.None;
                     break;
                 case EditorInputMode.SelectOnly:
                     mappings.Editor.Pan.Value = MultiGesture.None;
+                    mappings.Editor.Cutting.Value = MultiGesture.None;
+                    mappings.ItemContainer.Drag.Value = MultiGesture.None;
+                    mappings.Connector.Connect.Value = MultiGesture.None;
+                    break;
+                case EditorInputMode.CutOnly:
+                    mappings.Editor.Cutting.Value = new MouseGesture(MouseAction.LeftClick);
+                    mappings.Editor.Selection.Apply(EditorGestures.SelectionGestures.None);
+                    mappings.Editor.Pan.Value = MultiGesture.None;
+                    mappings.ItemContainer.Selection.Apply(EditorGestures.SelectionGestures.None);
                     mappings.ItemContainer.Drag.Value = MultiGesture.None;
                     mappings.Connector.Connect.Value = MultiGesture.None;
                     break;

Examples/Nodify.Playground/EditorSettings.cs

@@ -178,6 +178,11 @@ private EditorSettings()
                     val => Instance.AutoPanningTickRate = val,
                     "Auto panning tick rate: ",
                     "How often is the new position calculated in milliseconds. Disable and enable auto panning for this to have effect."),
+                new ProxySettingViewModel<bool>(
+                    () => Instance.AllowCuttingCancellation,
+                    val => Instance.AllowCuttingCancellation = val,
+                    "Allow cutting cancellation: ",
+                    "Right click to cancel cutting."),
                 new ProxySettingViewModel<bool>(
                     () => Instance.AllowDraggingCancellation,
                     val => Instance.AllowDraggingCancellation = val,
@@ -193,6 +198,11 @@ private EditorSettings()
                     val => Instance.EnableSnappingCorrection = val,
                     "Enable snapping correction: ",
                     "Correct the final position when moving a selection"),
+                new ProxySettingViewModel<bool>(
+                    () => Instance.EnableCuttingLinePreview,
+                    val => Instance.EnableCuttingLinePreview = val,
+                    "Enable cutting line preview: ",
+                    "Applies custom connection style on intersection (hurts performance due to hit testing)."),
                 new ProxySettingViewModel<bool>(
                     () => Instance.EnableConnectorOptimizations,
                     val => Instance.EnableConnectorOptimizations = val,
@@ -239,6 +249,8 @@ private EditorSettings()
                     "Enable sticky connectors: ",
                     "The connection can be completed in two steps (e.g. click to create pending connection, click to connect)"),
             };
+
+            EnableCuttingLinePreview = true;
         }
 
         public static EditorSettings Instance { get; } = new EditorSettings();
@@ -478,6 +490,12 @@ public double AutoPanningTickRate
             set => NodifyEditor.AutoPanningTickRate = value;
         }
 
+        public bool AllowCuttingCancellation
+        {
+            get => CuttingLine.AllowCuttingCancellation;
+            set => CuttingLine.AllowCuttingCancellation = value;
+        }
+
         public bool AllowDraggingCancellation
         {
             get => ItemContainer.AllowDraggingCancellation;
@@ -496,6 +514,12 @@ public bool EnableSnappingCorrection
             set => NodifyEditor.EnableSnappingCorrection = value;
         }
 
+        public bool EnableCuttingLinePreview
+        {
+            get => NodifyEditor.EnableCuttingLinePreview;
+            set => NodifyEditor.EnableCuttingLinePreview = value;
+        }
+
         public bool EnableConnectorOptimizations
         {
             get => Connector.EnableOptimizations;

Examples/Nodify.Shapes/MainWindow.xaml.cs

@@ -12,6 +12,7 @@ public MainWindow()
             InitializeComponent();
 
             NodifyEditor.EnableDraggingContainersOptimizations = false;
+            NodifyEditor.EnableCuttingLinePreview = true;
         }
     }
 }

Examples/Nodify.StateMachine/MainWindow.xaml

@@ -50,6 +50,7 @@
                              PendingConnection="{Binding PendingTransition}"
                              DisconnectConnectorCommand="{Binding DisconnectStateCommand}"
                              ConnectionCompletedCommand="{Binding CreateTransitionCommand}"
+                             RemoveConnectionCommand="{Binding DeleteTransitionCommand}"
                              Grid.Column="1">
             <nodify:NodifyEditor.PendingConnectionTemplate>
                 <DataTemplate DataType="{x:Type local:TransitionViewModel}">

Examples/Nodify.StateMachine/MainWindow.xaml.cs

@@ -9,6 +9,9 @@ public MainWindow()
             InitializeComponent();
 
             Connector.EnableStickyConnections = true;
+            NodifyEditor.EnableCuttingLinePreview = true;
+
+            EditorGestures.Mappings.Connection.Disconnect.Value = MultiGesture.None;
         }
     }
 }

Nodify/Compatibility/VisualTreeHelper.cs

@@ -22,6 +22,14 @@ public static void HitTest(UIElement element,
             topMost = GetParent(topMost);
         }
     }
+
+    public static void HitTest(UIElement element,
+        Func<DependencyObject, HitTestFilterBehavior> filter,
+        Func<HitTestResult, HitTestResultBehavior> test,
+        GeometryHitTestParameters parameters)
+    {
+        // unfortunately this is not supported in Avalonia
+    }
 }
 
 internal class PointHitTestParameters
@@ -38,7 +46,19 @@ internal enum HitTestFilterBehavior
 {
     Continue,
     ContinueSkipSelfAndChildren,
-    Stop
+    Stop,
+    ContinueSkipChildren,
+    ContinueSkipSelf
+}
+
+internal class GeometryHitTestParameters
+{
+    public GeometryHitTestParameters(Geometry geometry)
+    {
+        Geometry = geometry;
+    }
+
+    public Geometry Geometry { get; }
 }
 
 internal enum HitTestResultBehavior

Nodify/Connections/BaseConnection.cs

@@ -1,7 +1,6 @@
 using System;
 using System.ComponentModel;
 using System.Globalization;
-using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
@@ -685,44 +684,52 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
             if (gestures.Split.Matches(e.Source, e))
             {
                 Point splitLocation = e.GetPosition(this);
-                object? connection = DataContext;
-                var args = new ConnectionEventArgs(connection)
-                {
-                    RoutedEvent = SplitEvent,
-                    SplitLocation = splitLocation,
-                    Source = this
-                };
-
-                RaiseEvent(args);
-
-                // Raise SplitCommand if SplitEvent is not handled
-                if (!args.Handled && (SplitCommand?.CanExecute(splitLocation) ?? false))
-                {
-                    SplitCommand.Execute(splitLocation);
-                }
+                OnSplit(splitLocation);
 
                 e.Handled = true;
             }
             else if (gestures.Disconnect.Matches(e.Source, e))
             {
-                Point splitLocation = e.GetPosition(this);
-                object? connection = DataContext;
-                var args = new ConnectionEventArgs(connection)
-                {
-                    RoutedEvent = DisconnectEvent,
-                    SplitLocation = splitLocation,
-                    Source = this
-                };
+                OnDisconnect();
 
-                RaiseEvent(args);
+                e.Handled = true;
+            }
+        }
 
-                // Raise DisconnectCommand if DisconnectEvent is not handled
-                if (!args.Handled && (DisconnectCommand?.CanExecute(splitLocation) ?? false))
-                {
-                    DisconnectCommand.Execute(splitLocation);
-                }
+        protected internal void OnSplit(Point splitLocation)
+        {
+            object? connection = DataContext;
+            var args = new ConnectionEventArgs(connection)
+            {
+                RoutedEvent = SplitEvent,
+                SplitLocation = splitLocation,
+                Source = this
+            };
 
-                e.Handled = true;
+            RaiseEvent(args);
+
+            // Raise SplitCommand if SplitEvent is not handled
+            if (!args.Handled && (SplitCommand?.CanExecute(splitLocation) ?? false))
+            {
+                SplitCommand.Execute(splitLocation);
+            }
+        }
+
+        protected internal void OnDisconnect()
+        {
+            object? connection = DataContext;
+            var args = new ConnectionEventArgs(connection)
+            {
+                RoutedEvent = DisconnectEvent,
+                Source = this
+            };
+
+            RaiseEvent(args);
+
+            // Raise DisconnectCommand if DisconnectEvent is not handled
+            if (!args.Handled && (DisconnectCommand?.CanExecute(null) ?? false))
+            {
+                DisconnectCommand.Execute(null);
             }
         }
 

Nodify/Connections/CircuitConnection.cs

@@ -26,6 +26,7 @@ public double Angle
         static CircuitConnection()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(CircuitConnection), new FrameworkPropertyMetadata(typeof(CircuitConnection)));
+            NodifyEditor.CuttingConnectionTypes.Add(typeof(CircuitConnection));
             AffectsRender<CircuitConnection>(AngleProperty);
         }
 

Nodify/Connections/Connection.cs

@@ -13,6 +13,7 @@ public class Connection : BaseConnection
         static Connection()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(Connection), new FrameworkPropertyMetadata(typeof(Connection)));
+            NodifyEditor.CuttingConnectionTypes.Add(typeof(Connection));
         }
 
         private const double _baseOffset = 100d;