fix for form and Zindex

RomanSoloweow · RomanSoloweow · commit c65930402f59 · 2020-04-06T00:14:40.000+03:00
diff --git a/SimpleStateMachineNodeEditor/Styles/Colors.xaml b/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-->
     
diff --git a/SimpleStateMachineNodeEditor/View/ViewConnect.xaml b/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>
diff --git a/SimpleStateMachineNodeEditor/View/ViewConnect.xaml.cs b/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
     }
diff --git a/SimpleStateMachineNodeEditor/View/ViewCutter.xaml b/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>
diff --git a/SimpleStateMachineNodeEditor/View/ViewNode.xaml b/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}" />
diff --git a/SimpleStateMachineNodeEditor/View/ViewNode.xaml.cs b/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);
diff --git a/SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml b/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>
diff --git a/SimpleStateMachineNodeEditor/View/ViewRightConnector.xaml.cs b/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()
diff --git a/SimpleStateMachineNodeEditor/ViewModel/ViewModelNode.cs b/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();
         }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ private void SetupBinding()`
`49`	`49`	`{`
`50`	`50`	`this.WhenActivated(disposable =>`
`51`	`51`	`{`
`52`		`- Canvas.SetZIndex((UIElement)this.VisualParent, this.ViewModel.FromConnector.NodesCanvas.Nodes.Count);`
	`52`	`+`
`53`	`53`	`// Цвет линии`
`54`	`54`	`this.OneWayBind(this.ViewModel, x => x.Stroke, x => x.Path.Stroke).DisposeWith(disposable);`
`55`	`55`
`@@ -69,6 +69,8 @@ private void SetupBinding()`
`69`	`69`
`70`	`70`	`this.OneWayBind(this.ViewModel, x => x.StrokeThickness, x => x.Path.StrokeThickness).DisposeWith(disposable);`
`71`	`71`
	`72`	`+ this.WhenAnyValue(x => x.ViewModel.ToConnector).Where(x=>x!=null).Subscribe(_ => UpdateZindex()).DisposeWith(disposable);`
	`73`	`+`
`72`	`74`	`});`
`73`	`75`	`}`
`74`	`76`	`#endregion SetupBinding`
`@@ -81,6 +83,10 @@ private void SetupEvents()`
`81`	`83`
`82`	`84`	`});`
`83`	`85`	`}`
	`86`	`+ private void UpdateZindex()`
	`87`	`+ {`
	`88`	`+ Canvas.SetZIndex((UIElement)this.VisualParent, this.ViewModel.ToConnector.Node.Zindex);`
	`89`	`+ }`
`84`	`90`
`85`	`91`	`#endregion SetupEvents`
`86`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ private void SetupBinding()`
`54`	`54`	`{`
`55`	`55`	`this.WhenActivated(disposable =>`
`56`	`56`	`{`
`57`		`- Canvas.SetZIndex((UIElement)this.VisualParent,this.ViewModel.NodesCanvas.Nodes.Count);`
	`57`	`+ Canvas.SetZIndex((UIElement)this.VisualParent,this.ViewModel.Zindex);`
`58`	`58`
`59`	`59`	`//BorderBrush (Рамка вокруг узла)`
`60`	`60`	`this.OneWayBind(this.ViewModel, x => x.BorderBrush, x => x.Border.BorderBrush).DisposeWith(disposable);`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ private void SetupBinding()`
`53`	`53`	`{`
`54`	`54`	`this.WhenActivated(disposable =>`
`55`	`55`	`{`
	`56`	`+ Canvas.SetZIndex((UIElement)this.VisualParent, this.ViewModel.Node.Zindex+2);`
`56`	`57`
`57`	`58`	`this.ViewModel.FormFill = Application.Current.Resources["ColorRightConnectorEllipseEnableBackground"] as SolidColorBrush;`
`58`	`59`	`this.ViewModel.FormStroke = Application.Current.Resources["ColorRightConnectorEllipseEnableBorder"] as SolidColorBrush;`
`@@ -162,6 +163,7 @@ void UpdatePositionConnectPoin()`
`162`	`163`	`{`
`163`	`164`
`164`	`165`	`Point positionConnectPoint;`
	`166`	`+ MyPoint Position;`
`165`	`167`	`//Если отображается`
`166`	`168`	`if (this.IsVisible)`
`167`	`169`	`{`
`@@ -174,16 +176,20 @@ void UpdatePositionConnectPoin()`
`174`	`176`	`//Получаем позицию центру на канвасе`
`175`	`177`	`positionConnectPoint = this.TransformToAncestor(NodesCanvas).Transform(positionConnectPoint);`
`176`	`178`
	`179`	`+ Position = MyPoint.CreateFromPoint(positionConnectPoint) / this.ViewModel.NodesCanvas.Scale.Value;`
	`180`	`+`
`177`	`181`	`}`
`178`	`182`	`else`
`179`	`183`	`{`
`180`	`184`	`//Позиция выхода`
`181`	`185`	`positionConnectPoint = this.ViewModel.Node.Output.PositionConnectPoint.Value;`
	`186`	`+`
	`187`	`+ Position = MyPoint.CreateFromPoint(positionConnectPoint);`
`182`	`188`	`}`
`183`	`189`
`184`	`190`
`185`		`- MyPoint Position = MyPoint.CreateFromPoint(positionConnectPoint);`
`186`		`- this.ViewModel.PositionConnectPoint.Set(Position / this.ViewModel.NodesCanvas.Scale.Value);`
	`191`	`+`
	`192`	`+ this.ViewModel.PositionConnectPoint.Set(Position);`
`187`	`193`	`}`
`188`	`194`
`189`	`195`	`//void UpdatePosition()`