Merge branch 'develop'

Author: RomanSoloweow

SimpleStateMachineNodeEditor/SimpleStateMachine.png

@@ -6,6 +6,15 @@
     <UseWPF>true</UseWPF>
     <StartupObject>SimpleStateMachineNodeEditor.App</StartupObject>
     <ApplicationIcon>StateMachine.ico</ApplicationIcon>
+    <SignAssembly>false</SignAssembly>
+    <Version>1.0.2</Version>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/SimpleStateMachine/SimpleStateMachineNodeEditor</PackageProjectUrl>
+    <PackageIcon>SimpleStateMachine.png</PackageIcon>
+    <RepositoryUrl>https://github.com/SimpleStateMachine/SimpleStateMachineNodeEditor</RepositoryUrl>
+    <PackageTags>statemachine state-machine finite-state-machine</PackageTags>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <Description>Node editor for SimpleStateMachine</Description>
   </PropertyGroup>
 
   <ItemGroup>
@@ -36,6 +45,10 @@
     <None Remove="Icons\ZoomOriginalSize_16x.svg" />
     <None Remove="Icons\ZoomOut_16x.png" />
     <None Remove="Icons\ZoomOut_16x.svg" />
+    <None Include="SimpleStateMachine.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
   </ItemGroup>
 
   <ItemGroup>

SimpleStateMachineNodeEditor/SimpleStateMachineNodeEditor.csproj

@@ -80,7 +80,9 @@ private void SetupBinding()
                 this.OneWayBind(this.ViewModel, x => x.Output, x => x.Output.ViewModel).DisposeWith(disposable);
 
                 this.OneWayBind(this.ViewModel, x => x.Transitions, x => x.ItemsControlTransitions.ItemsSource).DisposeWith(disposable);
-                
+
+                this.WhenAnyValue(v => v.NodeHeaderElement.ActualWidth).BindTo(this, v => v.ViewModel.HeaderWidth).DisposeWith(disposable);
+
             });
         }
         #endregion Setup Binding

SimpleStateMachineNodeEditor/View/ViewNode.xaml.cs

@@ -30,7 +30,6 @@ public partial class ViewModelConnector : ReactiveObject
         [Reactive] public ViewModelNodesCanvas NodesCanvas { get; set; }
         [Reactive] public bool Selected { get; set; }
 
-        private IDisposable subscriptionOnNodeWidthChange;
         public ViewModelConnector(ViewModelNodesCanvas nodesCanvas, ViewModelNode viewModelNode, string name, Point myPoint)
         {
             Node = viewModelNode;
@@ -48,29 +47,17 @@ private void SetupSubscriptions()
 
             if (this.Name!="Input")
             {
-                this.WhenAnyValue(x => x.Node.IsCollapse).Subscribe(value => UpdateSubscriptionForPosition(value));
+                this.WhenAnyValue(x => x.Node.HeaderWidth).Buffer(2, 1).Subscribe(x => UpdatePositionOnWidthChange(x[1] - x[0]));
                 if (this.Name != "Output")
                 {
-                    this.WhenAnyValue(x => x.Node.Transitions.Count).Subscribe(x => UpdatePositionOnTransitionCountChange());
-                   
+                    this.WhenAnyValue(x => x.Node.Transitions.Count).Subscribe(x => UpdatePositionOnTransitionCountChange());                   
                 }
 
             }
 
             this.WhenAnyValue(x => x.Node.Point1).Buffer(2, 1).Subscribe(value => PositionConnectPoint = PositionConnectPoint.Addition(value[1].Subtraction(value[0])));
         }
-        private void UpdateSubscriptionForPosition(bool nodeIsCollapse)
-        {
-            if (!nodeIsCollapse)
-            {
-                subscriptionOnNodeWidthChange = this.WhenAnyValue(x => x.Node.Size.Width).Buffer(2, 1).Where(x => (x[0]>= 80 && x[1] >= 80))
-                    .Subscribe(x => UpdatePositionOnWidthChange(x[1] - x[0]));
-            }
-            else
-            {
-                subscriptionOnNodeWidthChange?.Dispose();
-            }
-        }
+
         private void UpdatePositionOnTransitionCountChange()
         {
             if (!string.IsNullOrEmpty(Name))
@@ -81,13 +68,7 @@ private void UpdatePositionOnTransitionCountChange()
         }
         private void UpdatePositionOnWidthChange(double value)
         {
-            if(!Node.AfterCollapse)       
-                this.PositionConnectPoint = this.PositionConnectPoint.Addition(value, 0);
-
-            if ((Node.AfterCollapse)&&(string.IsNullOrEmpty(this.Name)))
-            {
-                Node.AfterCollapse = false;
-            }
+            this.PositionConnectPoint = this.PositionConnectPoint.Addition(value, 0);
         }
         private void UpdateResources()
         {

SimpleStateMachineNodeEditor/ViewModel/Connector/ViewModelConnector.cs

@@ -19,8 +19,6 @@ public partial class ViewModelNode : ReactiveValidationObject<ViewModelNode>
         [Reactive] public Point Point1 { get; set; }
         [Reactive] public Point Point2 { get; set; }
         [Reactive] public Size Size { get; set; }
-        //[Reactive] public double WidthBeforeCollapse { get; set; }
-        [Reactive] public bool AfterCollapse { get; set; }
         [Reactive] public string Name { get; set; }
         [Reactive] public bool NameEnable { get; set; } = true;
         [Reactive] public bool Selected { get; set; }
@@ -35,6 +33,8 @@ public partial class ViewModelNode : ReactiveValidationObject<ViewModelNode>
         [Reactive] public ViewModelNodesCanvas NodesCanvas { get; set; }
         [Reactive] public int IndexStartSelectConnectors { get; set; } = 0;
 
+        [Reactive] public double HeaderWidth { get; set; } = 80;
+
         public IObservableCollection<ViewModelConnector> Transitions { get; set; } = new ObservableCollectionExtended<ViewModelConnector>();
         public int Zindex { get; private set; }
 
@@ -105,8 +105,6 @@ private void Collapse(bool value)
             }
             else
             {
-                AfterCollapse = true;
-                //WidthBeforeCollapse = Size.Width;
                 TransitionsVisible = null;
                 Output.Visible = true;
                 UnSelectedAllConnectors();