fix for form and Zindex

Author: RomanSoloweow

SimpleStateMachineNodeEditor/Styles/Colors.xaml

@@ -4,8 +4,8 @@
 
     <!--#region -->
     <!--#endregion-->
-    <!--white-->
-    <SolidColorBrush x:Key="ColorConnector" Color="White"/> 
+    <!--White-->
+    <SolidColorBrush x:Key="ColorConnector" Color="Red"/> 
 
     <!--#region     Node-->
 

SimpleStateMachineNodeEditor/View/ViewConnect.xaml

@@ -7,9 +7,9 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800" IsHitTestVisible="False">
     <Grid>
-        <Path x:Name="Path" StrokeDashCap="Round" StrokeLineJoin="Round" Stroke="{StaticResource ColorConnector}">
+        <Path x:Name="Path" StrokeDashCap="Round" StrokeLineJoin="Round" Stroke="{StaticResource ColorConnector}" StrokeEndLineCap="Round" StrokeStartLineCap="Round">
             <Path.Data>
-                <PathGeometry  x:Name="PathGeometry" >
+                <PathGeometry  x:Name="PathGeometry">
                     <PathFigure x:Name="PathFigure"  IsClosed="False">
                         <BezierSegment  x:Name="BezierSegment"/>
                     </PathFigure>

SimpleStateMachineNodeEditor/View/ViewConnect.xaml.cs

@@ -49,7 +49,7 @@ private void SetupBinding()
         {
             this.WhenActivated(disposable =>
             {
-                Canvas.SetZIndex((UIElement)this.VisualParent, this.ViewModel.FromConnector.NodesCanvas.Nodes.Count);
+
                 // Цвет линии
                 this.OneWayBind(this.ViewModel, x => x.Stroke, x => x.Path.Stroke).DisposeWith(disposable);
 
@@ -69,6 +69,8 @@ private void SetupBinding()
 
                 this.OneWayBind(this.ViewModel, x => x.StrokeThickness, x => x.Path.StrokeThickness).DisposeWith(disposable);
 
+                this.WhenAnyValue(x => x.ViewModel.ToConnector).Where(x=>x!=null).Subscribe(_ => UpdateZindex()).DisposeWith(disposable);
+
             });
         }
         #endregion SetupBinding
@@ -81,6 +83,10 @@ private void SetupEvents()
 
             });
         }
+        private void UpdateZindex()
+        {
+            Canvas.SetZIndex((UIElement)this.VisualParent, this.ViewModel.ToConnector.Node.Zindex);
+        }
 
         #endregion SetupEvents
     }

SimpleStateMachineNodeEditor/View/ViewCutter.xaml

@@ -14,5 +14,5 @@
             <TranslateTransform x:Name="Translate"/>
         </TransformGroup>
     </UserControl.RenderTransform>
-    <Line x:Name="Line" Fill="White" Stroke="Red"  HorizontalAlignment="Left" VerticalAlignment="Top" StrokeDashArray="10, 3" StrokeDashCap="Round"/>
+    <Line x:Name="Line" Fill="White" Stroke="Red"  HorizontalAlignment="Left" VerticalAlignment="Top" StrokeDashArray="10, 3" StrokeDashCap="Round" StrokeEndLineCap="Round" StrokeStartLineCap="Round"/>
 </UserControl>

SimpleStateMachineNodeEditor/View/ViewNode.xaml

@@ -4,8 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:SimpleStateMachineNodeEditor.View"
-             mc:Ignorable="d" Focusable="True" AllowDrop="True" Visibility="Visible"> 
-    
+             mc:Ignorable="d" Focusable="True" AllowDrop="True" Visibility="Visible">
+
     <Border x:Name="Border" CornerRadius="5,5,5,5" BorderThickness="1,1,1,1"   HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="80" Background="{DynamicResource ColorNodeBody}" >
         <StackPanel Margin="0,0,0,5">
             <TextBox Name="Header" VerticalAlignment="Top" VerticalContentAlignment="Center" Style="{DynamicResource NodeHeaderStyle}" BorderBrush="{x:Null}"  HorizontalContentAlignment="Center" BorderThickness="0" Padding="10,2" Foreground="{DynamicResource ColorNodeText}" />

SimpleStateMachineNodeEditor/View/ViewNode.xaml.cs

@@ -54,7 +54,7 @@ private void SetupBinding()
         {
             this.WhenActivated(disposable =>
             {
-                Canvas.SetZIndex((UIElement)this.VisualParent,this.ViewModel.NodesCanvas.Nodes.Count);
+                Canvas.SetZIndex((UIElement)this.VisualParent,this.ViewModel.Zindex);
 
                 //BorderBrush (Рамка вокруг узла)
                 this.OneWayBind(this.ViewModel, x => x.BorderBrush, x => x.Border.BorderBrush).DisposeWith(disposable);

SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml

@@ -33,7 +33,7 @@
                 <DataTemplate DataType="{x:Type ViewModel:ViewModelConnect}">
                     <View:ViewConnect ViewModel="{Binding}"/>
                 </DataTemplate>
-                <DataTemplate   DataType="{x:Type ViewModel:ViewModelNode}">
+                <DataTemplate DataType="{x:Type ViewModel:ViewModelNode}">
                     <View:ViewNode ViewModel="{Binding}" />
                 </DataTemplate>
             </ItemsControl.Resources>

SimpleStateMachineNodeEditor/View/ViewRightConnector.xaml.cs

@@ -53,6 +53,7 @@ private void SetupBinding()
         {
             this.WhenActivated(disposable =>
             {
+                Canvas.SetZIndex((UIElement)this.VisualParent, this.ViewModel.Node.Zindex+2);
 
                 this.ViewModel.FormFill = Application.Current.Resources["ColorRightConnectorEllipseEnableBackground"] as SolidColorBrush;
                 this.ViewModel.FormStroke = Application.Current.Resources["ColorRightConnectorEllipseEnableBorder"] as SolidColorBrush;
@@ -162,6 +163,7 @@ void UpdatePositionConnectPoin()
         {
 
             Point positionConnectPoint;
+            MyPoint Position;
             //Если отображается
             if (this.IsVisible)
             {
@@ -174,16 +176,20 @@ void UpdatePositionConnectPoin()
                 //Получаем позицию центру на канвасе
                 positionConnectPoint = this.TransformToAncestor(NodesCanvas).Transform(positionConnectPoint);
 
+                Position  = MyPoint.CreateFromPoint(positionConnectPoint) / this.ViewModel.NodesCanvas.Scale.Value;
+
             }
             else
             {
                 //Позиция выхода
                 positionConnectPoint = this.ViewModel.Node.Output.PositionConnectPoint.Value;
+
+                Position = MyPoint.CreateFromPoint(positionConnectPoint);
             }
 
 
-            MyPoint Position = MyPoint.CreateFromPoint(positionConnectPoint);
-            this.ViewModel.PositionConnectPoint.Set(Position / this.ViewModel.NodesCanvas.Scale.Value);
+           
+            this.ViewModel.PositionConnectPoint.Set(Position);
         }
 
         //void UpdatePosition()

SimpleStateMachineNodeEditor/ViewModel/ViewModelNode.cs

@@ -91,7 +91,7 @@ public class ViewModelNode : ReactiveValidationObject<ViewModelNode>
         /// </summary>
         [Reactive] public ViewModelNodesCanvas NodesCanvas { get; set; }
 
-        [Reactive] public int Zindex { get; set; }
+        public int Zindex { get; private set; }
 
         /// <summary>
         /// Список переходов
@@ -106,7 +106,7 @@ public ViewModelNode(ViewModelNodesCanvas nodesCanvas)
             //this.WhenAnyValue(x=>x.Name).Subscribe()
             this.WhenAnyValue(x => x.Selected).Subscribe(value => { this.BorderBrush = value ? Brushes.Red : Brushes.LightGray; });
             this.WhenAnyValue(x => x.Point1.Value, x => x.Size).Subscribe(_ => UpdatePoint2());
-
+            Zindex = nodesCanvas.Nodes.Count;
             SetupConnectors();
             SetupCommands();
         }