fix

Author: RomanSoloweow

StateMachineNodeEditorNerCore/View/ViewNodesCanvas.xaml.cs

@@ -108,7 +108,6 @@ private void BindingCommands()
                 this.BindCommand(this.ViewModel, x => x.CommandAddNode, x => x.ItemAddNode, positionRightClickObservable).DisposeWith(disposable);
                 this.WhenAnyValue(x => x.ViewModel.Selector.Size).InvokeCommand(ViewModel.CommandSelectorIntersect).DisposeWith(disposable);
                 this.WhenAnyValue(x => x.ViewModel.Cutter.EndPoint.Value).InvokeCommand(ViewModel.CommandCutterIntersect).DisposeWith(disposable);
-                this.WhenAnyValue(x => x.ViewModel.DraggedConnector).Subscribe(_ => UpdateConnector()).DisposeWith(disposable);
 
 
                 this.OneWayBind(this.ViewModel, x => x.Text, x => x.TestBox.Text).DisposeWith(disposable);
@@ -177,7 +176,7 @@ private void OnEventMouseLeftUp(MouseButtonEventArgs e)
         private void OnEventMouseRightDown(MouseButtonEventArgs e)
         {
             Keyboard.Focus(this);
-            this.ViewModel.Text = new MyPoint(e.GetPosition(this)).ToString();
+
         }
         private void OnEventMouseRightUp(MouseButtonEventArgs e)
         {

StateMachineNodeEditorNerCore/View/ViewRightConnector.xaml.cs

@@ -85,7 +85,7 @@ private void SetupBinding()
                 this.WhenAnyValue(x => x.ViewModel.Node.Size, x => x.ViewModel.Node.Point1.Value, x => x.ViewModel.Node.NodesCanvas.Scale.Scales.Value)
                 .Subscribe(_ => { UpdatePositionConnectPoin(); }).DisposeWith(disposable);
 
-
+                this.WhenAnyValue(x => x.ViewModel.Node.Size).Subscribe(_ => { Test(); }).DisposeWith(disposable);
                 //// При изменении размера, позиции или zoom узла
                 //this.WhenAnyValue(x => x.ViewModel.Node.Size, x => x.ViewModel.Node.Point1.Value, x => x.ViewModel.Node.NodesCanvas.Scale.Scales.Value, x => x.ViewModel.Position).
                 //Subscribe(_ => { UpdatePositionConnectPoin(); }).DisposeWith(disposable);
@@ -178,16 +178,11 @@ private void ConnectorDrag(MouseButtonEventArgs e)
             data.SetData("Connector", this.ViewModel);
             DragDrop.DoDragDrop(this, data, DragDropEffects.Link);
             this.ViewModel?.CommandCheckConnectorDrop.Execute();
-
-            //this.UpdatePosition();
-            //e.Handled = true;
+            e.Handled = true;
         }
         private void Test()
         {
-            //if(this.ViewModel ==this.ViewModel.NodesCanvas.DraggedConnector)
-            //{
-            //    UpdatePosition();
-            //}
+            UpdatePositionConnectPoin();
         }
         private void ConnectorDragOver(DragEventArgs e)
         {
@@ -214,41 +209,16 @@ private void ConnectorDragEnter(DragEventArgs e)
         {
             if (this.ViewModel.NodesCanvas.ConnectorPreviewForDrop == null)
                 return;
-            if (this.ViewModel.NodesCanvas.ConnectorPreviewForDrop == this.ViewModel)
-                return;
 
             this.ViewModel.CommandConnectorDragEnter.Execute();
-            this.ViewModel.Node.Point1 += 0.001;
-
-            e.Handled = true;
         }
 
         private void ConnectorDragLeave(DragEventArgs e)
         {
 
-            //new
-            if (this.ViewModel.NodesCanvas.DraggedConnector == null)
-                return;
-            //new
             if (this.ViewModel.NodesCanvas.ConnectorPreviewForDrop != null)
                 return;
-
-            //if (this.ViewModel.NodesCanvas.DraggedConnector.Name == this.ViewModel.Name)
-            //{
-            //    this.UpdatePosition();
-            //    e.Handled = true;
-            //    return;
-            //}
-            //else
-            //{
                 this.ViewModel.CommandConnectorDragLeave.Execute();
-            //}
-
-
-           
-
-            //if (this.ViewModel.NodesCanvas.ConnectorPreviewForDrop == null)
-            //    return;
 
             e.Handled = true;
 
@@ -259,10 +229,9 @@ private void ConnectorDrop(DragEventArgs e)
         {
             if (this.ViewModel.NodesCanvas.ConnectorPreviewForDrop == null)
                 return;
-
+           
             this.ViewModel.CommandConnectorDrop.Execute();
-
-            //e.Handled = true;
+            e.Handled = true;
         }
 
         #endregion SetupEvents

StateMachineNodeEditorNerCore/ViewModel/ViewModelConnector.cs

@@ -178,13 +178,18 @@ private void ConnectorDragEnter()
 
             if ((indexFrom > -1) && (indexTo > -1) && (indexFrom < count) && (indexTo < count))
             {
-                this.Node.Transitions.RemoveAt(indexFrom);              
-                this.Node.Transitions.Insert(indexTo + 1, this.NodesCanvas.ConnectorPreviewForDrop);                
+                if(indexTo==count-1)
+                {
+                    this.Node.Transitions.RemoveAt(indexFrom);
+                    this.Node.Transitions.Add(this.NodesCanvas.ConnectorPreviewForDrop);
+                }
+                else
+                {
+                    var t = this.Node.Transitions[indexFrom].PositionConnectPoint.Value;
+                    this.Node.Transitions.Move(indexFrom, indexTo + 1);
+                    this.Node.Transitions[indexFrom].PositionConnectPoint.Set(t);
+                }
             }
-            
-            //this.Node.Transitions.Move(indexFrom, indexTo+1);
-
-            //this.Node.Point1 += 0.0001;
         }
         private void ConnectorDragLeave()
         {

StateMachineNodeEditorNerCore/ViewModel/ViewModelNodesCanvas.cs

@@ -22,7 +22,6 @@ public class ViewModelNodesCanvas : ReactiveObject
         [Reactive] public ViewModelSelector Selector { get; set; } = new ViewModelSelector();
         [Reactive] public ViewModelCutter Cutter { get; set; } = new ViewModelCutter();
         [Reactive] public ViewModelConnect DraggedConnect { get; set; }
-        [Reactive] public ViewModelConnector DraggedConnector { get; set; }
         [Reactive] public ViewModelConnector ConnectorPreviewForDrop { get; set; }
         [Reactive] public ViewModelNode CurrentNode { get; set; }
 
@@ -167,11 +166,6 @@ private void UnSelectedAll()
             foreach (var node in Nodes)
             { node.Selected = false; }
         }
-
-        public bool HasConnectorDrag()
-        {
-            return ((DraggedConnector != null) || (ConnectorPreviewForDrop != null));
-        }
         private List<ViewModelNode> FullMoveAllNode(MyPoint delta, List<ViewModelNode> nodes = null)
         {
             MyPoint myPoint = delta.Copy();