some feature

Author: RomanSoloweow

SimpleStateMachineNodeEditor/Styles/Themes/Light.xaml

@@ -12,9 +12,10 @@
 
     <SolidColorBrush x:Key="ColorSelectedElement"  Color="#D23030"/>
 
-    <SolidColorBrush x:Key="ColorConnect" Color="#98989a"/>
-
-    <SolidColorBrush x:Key="ColorConnector" Color="#98989a"/>
+    <SolidColorBrush x:Key="ColorConnect" Color="#414141"/>
+    
+    <!--#98989a-->
+    <SolidColorBrush x:Key="ColorConnector" Color="#414141"/>
 
     <SolidColorBrush x:Key="ColorConnectorForeground" Color="Black"/>
 
@@ -81,7 +82,7 @@
 
     <SolidColorBrush x:Key="ColorNodeBorderBrush"  Color="#c2c3c9"/>
 
-    <Color x:Key="ColorNodeHeader" >#90414141</Color>
+    <Color x:Key="ColorNodeHeader" >#414141</Color>
 
     <SolidColorBrush x:Key="ColorNodeHeaderForeground" Color="White"/>
 

SimpleStateMachineNodeEditor/View/MainWindow.xaml

@@ -15,7 +15,7 @@
             <RowDefinition  Height="auto"/>
             <RowDefinition  Height="auto" x:Name="Fotter" MinHeight="18"/>
         </Grid.RowDefinitions>
-
+        <view:ViewDialog x:Name="Dialog"/>
 
         <!--#region Header-->
         <DockPanel x:Name="Header" Grid.Row="0" Background="{DynamicResource ColorWindowHeader}" LastChildFill="False">

SimpleStateMachineNodeEditor/View/MainWindow.xaml.cs

@@ -61,7 +61,9 @@ private void SetupBinding()
             {
                 var SelectedItem = this.ObservableForProperty(x => x.MessageList.SelectedItem).Select(x=>(x.Value as ViewModelMessage)?.Text);
                 this.BindCommand(this.ViewModel, x => x.CommandCopyError, x => x.BindingCopyError, SelectedItem).DisposeWith(disposable);
-                this.BindCommand(this.ViewModel, x => x.CommandCopyError, x => x.ItemCopyError, SelectedItem).DisposeWith(disposable);               
+                this.BindCommand(this.ViewModel, x => x.CommandCopyError, x => x.ItemCopyError, SelectedItem).DisposeWith(disposable);
+
+                this.OneWayBind(this.ViewModel, x => x.NodesCanvas.Dialog, x => x.Dialog.ViewModel).DisposeWith(disposable);
 
                 this.OneWayBind(this.ViewModel, x => x.Messages, x => x.MessageList.ItemsSource).DisposeWith(disposable);
                 this.OneWayBind(this.ViewModel, x => x.DebugEnable, x => x.LabelDebug.Visibility).DisposeWith(disposable);

SimpleStateMachineNodeEditor/View/ViewConnect.xaml.cs

@@ -48,7 +48,7 @@ private void SetupBinding()
         {
             this.WhenActivated(disposable =>
             {
-                Canvas.SetZIndex((UIElement)this.VisualParent, this.ViewModel.FromConnector.Node.Zindex + 1);
+                Canvas.SetZIndex((UIElement)this.VisualParent, 999);
 
                 this.OneWayBind(this.ViewModel, x => x.Stroke, x => x.PathElement.Stroke).DisposeWith(disposable);
 
@@ -70,8 +70,10 @@ private void SetupBinding()
 
         private void UpdateZindex()
         {
-            if (this.ViewModel.FromConnector.Node != this.ViewModel.ToConnector.Node)
-                Canvas.SetZIndex((UIElement)this.VisualParent, this.ViewModel.ToConnector.Node.Zindex);
+            int toIndex = this.ViewModel.ToConnector.Node.Zindex;
+            int fromIndex = this.ViewModel.FromConnector.Node.Zindex;
+           
+            Canvas.SetZIndex((UIElement)this.VisualParent, Math.Min(toIndex, fromIndex));
         }
         #endregion SetupBinding
     }

SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml

@@ -10,8 +10,7 @@
              d:DesignHeight="450" d:DesignWidth="800" Focusable="True" AllowDrop="True" ClipToBounds="True">
 
     <Canvas x:Name="Canvas" Background="{DynamicResource ColorNodesCanvasBackground}">
-
-        <local:ViewDialog x:Name="Dialog"/>
+        
         <local:ViewSelector x:Name="Selector"  Panel.ZIndex="999"/>
         <local:ViewCutter x:Name="Cutter"  Panel.ZIndex="999"/>
 

SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml.cs

@@ -75,8 +75,6 @@ private void SetupBinding()
                 this.OneWayBind(this.ViewModel, x => x.Selector, x => x.Selector.ViewModel).DisposeWith(disposable);
 
                 this.OneWayBind(this.ViewModel, x => x.Cutter, x => x.Cutter.ViewModel).DisposeWith(disposable);
-
-                this.OneWayBind(this.ViewModel, x => x.Dialog, x => x.Dialog.ViewModel).DisposeWith(disposable);
             });
         }
         #endregion Setup Binding