diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a55e9ae..20f0a271 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,11 @@
> - Breaking Changes:
> - 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**
diff --git a/Examples/Nodify.Calculator/MainWindow.xaml.cs b/Examples/Nodify.Calculator/MainWindow.xaml.cs
index fc9ecc0e..1502d828 100644
--- a/Examples/Nodify.Calculator/MainWindow.xaml.cs
+++ b/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;
}
}
}
diff --git a/Examples/Nodify.Playground/Editor/NodifyEditorView.xaml b/Examples/Nodify.Playground/Editor/NodifyEditorView.xaml
index 5873f9f4..4219332b 100644
--- a/Examples/Nodify.Playground/Editor/NodifyEditorView.xaml
+++ b/Examples/Nodify.Playground/Editor/NodifyEditorView.xaml
@@ -56,7 +56,8 @@
Duration="0:0:0.3" From="1" To="0.3" />
-
+
+
@@ -189,7 +199,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}">
+
+
+
+
+
+
-
-
-
+
+
\ No newline at end of file
diff --git a/Nodify/Themes/Styles/NodifyEditor.xaml b/Nodify/Themes/Styles/NodifyEditor.xaml
index 10e8b344..81c51612 100644
--- a/Nodify/Themes/Styles/NodifyEditor.xaml
+++ b/Nodify/Themes/Styles/NodifyEditor.xaml
@@ -4,7 +4,8 @@
-
+
+
@@ -58,9 +59,10 @@
IsItemsHost="True"
Extent="{Binding ItemsExtent, Mode=OneWayToSource, RelativeSource={RelativeSource TemplatedParent}}" />
-
+
+```
+
+## Customization
+
+The `CuttingLineStyle` is used to customize the cutting line:
+
+```xml
+
+
+
+```
diff --git a/docs/Minimap-Overview.md b/docs/Minimap-Overview.md
index 72d4b432..85075aa4 100644
--- a/docs/Minimap-Overview.md
+++ b/docs/Minimap-Overview.md
@@ -58,7 +58,7 @@ The `ViewportStyle` is used to customize the viewport rectangle.
-
+
```
The `MaxViewportOffset` property is used to restrict how far the viewport can be moved away from the items when [panning](#panning).
diff --git a/docs/_Sidebar.md b/docs/_Sidebar.md
index f170fcbc..514d0d4a 100644
--- a/docs/_Sidebar.md
+++ b/docs/_Sidebar.md
@@ -47,6 +47,12 @@
- [NodeInput and NodeOutput](Connectors-Overview#nodeinput-and-nodeoutput)
+[CuttingLine overview](CuttingLine-Overview)
+
+- [Enabling preview](CuttingLine-Overview#enabling-preview)
+- [Custom connections](CuttingLine-Overview#custom-connections)
+- [Customization](CuttingLine-Overview#customization)
+
[Minimap overview](Minimap-Overview)
- [Moving the viewport](Minimap-Overview#panning)