some fix and refactoring

Author: RomanSoloweow

SimpleStateMachineNodeEditor/Helpers/Logging/WithLogging.cs

@@ -185,9 +185,6 @@ private void ShowError()
                 this.ErrorListExpander.IsExpanded = true;
                 ErrorListExpanded();
             }
-            //this.ErrorListExpander.RaiseEvent(new RoutedEventArgs(Expander.ExpandedEvent));
-            //this.ErrorListExpander.IsExpanded = true;
-
         }
 
         private void ButtonMinClick(RoutedEventArgs e)

SimpleStateMachineNodeEditor/Helpers/MyPoint.cs

@@ -146,7 +146,6 @@ private void OnEventMouseUp(MouseButtonEventArgs e)
         }
         private void OnEventCollapse(bool isCollapse)
         {
-            //bool visible = (this.NodeHeaderElement.ButtonRotate.Angle != 0);
             this.NodeHeaderElement.ButtonRotate.Angle = isCollapse ? 180 : 0;
         }
         #endregion Setup Events

SimpleStateMachineNodeEditor/View/MainWindow.xaml.cs

@@ -100,6 +100,7 @@ private void SetupEvents()
                 this.TextBoxElement.Events().LostFocus.Subscribe(e => Validate(e)).DisposeWith(disposable);
                 this.BorderElement.Events().PreviewMouseLeftButtonDown.Subscribe(e => ConnectorDrag(e)).DisposeWith(disposable);
                 this.BorderElement.Events().PreviewDragEnter.Subscribe(e => ConnectorDragEnter(e)).DisposeWith(disposable);
+                this.BorderElement.Events().PreviewDragOver.Subscribe(e => e.Handled = true).DisposeWith(disposable);
                 this.BorderElement.Events().PreviewDrop.Subscribe(e => ConnectorDrop(e)).DisposeWith(disposable);
             });
         }
@@ -128,7 +129,7 @@ private void ConnectDrag(MouseButtonEventArgs e)
                 this.ViewModel.CommandConnectPointDrag.ExecuteWithSubscribe();
                 DataObject data = new DataObject();
                 data.SetData("Node", this.ViewModel.Node);
-                DragDrop.DoDragDrop(this, data, DragDropEffects.Link);
+                DragDrop.DoDragDrop(this, data, DragDropEffects.Copy);
                 this.ViewModel.CommandCheckConnectPointDrop.ExecuteWithSubscribe();
                 e.Handled = true;
             }
@@ -143,7 +144,7 @@ private void ConnectorDrag(MouseButtonEventArgs e)
                 this.ViewModel.CommandConnectorDrag.ExecuteWithSubscribe();
                 DataObject data = new DataObject();
                 data.SetData("Connector", this.ViewModel);
-                DragDrop.DoDragDrop(this, data, DragDropEffects.Link);
+                DragDrop.DoDragDrop(this, data, DragDropEffects.Copy);
             }
             else if (Keyboard.IsKeyDown(Key.LeftShift))
             {
@@ -168,9 +169,7 @@ private void ConnectorDragEnter(DragEventArgs e)
 
             if (this.ViewModel.NodesCanvas.ConnectorPreviewForDrop == this.ViewModel)
                 return;
-
             this.ViewModel.CommandConnectorDragEnter.ExecuteWithSubscribe();
-
             e.Handled = true;
         }
         private void ConnectorDrop(DragEventArgs e)

SimpleStateMachineNodeEditor/View/ViewNode.xaml.cs

@@ -74,10 +74,6 @@ private void Select(bool value)
             //this.StrokeDashArray = value ? new DoubleCollection() { 10, 3 } : null;
             this.Stroke =  Application.Current.Resources[value ? "ColorSelectedElement": "ColorConnect"] as SolidColorBrush;
         }
-        private void ToConnectChanged()
-        {
-            EndPointUpdate(ToConnector.PositionConnectPoint);
-        }
         private void StartPointUpdate(Point point)
         {
             StartPoint = point;

SimpleStateMachineNodeEditor/View/ViewRightConnector.xaml.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Reactive;
 using System.Windows;
+using System.Windows.Input;
 using System.Windows.Media;
 
 namespace SimpleStateMachineNodeEditor.ViewModel
@@ -106,7 +107,6 @@ private void ConnectorDragEnter()
             int indexTo = Node.Transitions.IndexOf(this);
             if (indexTo == 0)
                 return;
-
             int count = this.Node.Transitions.Count;
             int indexFrom = this.Node.Transitions.IndexOf(this.NodesCanvas.ConnectorPreviewForDrop);
 

SimpleStateMachineNodeEditor/ViewModel/Connect/ViewModelConnect.cs

@@ -4,12 +4,11 @@
 
 using System;
 using System.Reactive.Linq;
-using System.Reactive;
 using System.Windows;
 
 namespace SimpleStateMachineNodeEditor.ViewModel
 {
-    public class ViewModelCutter : ReactiveObject
+    public partial  class ViewModelCutter : ReactiveObject
     {
         [Reactive] public ViewModelNodesCanvas NodesCanvas { get; set; }
         [Reactive] public bool? Visible { get; set; } = false;
@@ -32,21 +31,5 @@ private void SetupSubscriptions()
         }
 
         #endregion Setup Subscriptions
-
-        #region Setup Commands
-        public ReactiveCommand<Point, Unit> CommandStartCut { get; set; }
-
-        private void SetupCommands()
-        {
-            CommandStartCut = ReactiveCommand.Create<Point>(StartCut);
-        }
-
-        private void StartCut(Point point)
-        {
-            Visible = true;
-            StartPoint = point;
-        }
-
-        #endregion Setup Commands
     }
 }

SimpleStateMachineNodeEditor/ViewModel/Connector/ViewModelConnectorCommands.cs

@@ -0,0 +1,25 @@
+using ReactiveUI;
+using System;
+using System.Collections.Generic;
+using System.Reactive;
+using System.Text;
+using System.Windows;
+
+namespace SimpleStateMachineNodeEditor.ViewModel
+{
+    public partial class ViewModelCutter
+    {
+        public ReactiveCommand<Point, Unit> CommandStartCut { get; set; }
+
+        private void SetupCommands()
+        {
+            CommandStartCut = ReactiveCommand.Create<Point>(StartCut);
+        }
+
+        private void StartCut(Point point)
+        {
+            Visible = true;
+            StartPoint = point;
+        }
+    }
+}