Skip to content

Commit 1d0436b

Browse files
RomanSoloweowRomanSoloweow
committed
some fix, optimization, feature with opacity
1 parent 61daf42 commit 1d0436b

12 files changed

+65
-55
lines changed

‎SimpleStateMachineNodeEditor/SimpleStateMachineNodeEditor.csproj

+6-1
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,19 @@
77
<StartupObject>SimpleStateMachineNodeEditor.App</StartupObject>
88
<ApplicationIcon>StateMachine.ico</ApplicationIcon>
99
<SignAssembly>false</SignAssembly>
10-
<Version>1.0.2</Version>
10+
<Version>1.0.3</Version>
1111
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1212
<PackageProjectUrl>https://github.com/SimpleStateMachine/SimpleStateMachineNodeEditor</PackageProjectUrl>
1313
<PackageIcon>SimpleStateMachine.png</PackageIcon>
1414
<RepositoryUrl>https://github.com/SimpleStateMachine/SimpleStateMachineNodeEditor</RepositoryUrl>
1515
<PackageTags>statemachine state-machine finite-state-machine</PackageTags>
1616
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
1717
<Description>Node editor for SimpleStateMachine</Description>
18+
<AssemblyVersion>1.0.3.0</AssemblyVersion>
19+
<FileVersion>1.0.3.0</FileVersion>
20+
<PackageReleaseNotes>some fix
21+
some optimization
22+
feature with opacity</PackageReleaseNotes>
1823
</PropertyGroup>
1924

2025
<ItemGroup>

‎SimpleStateMachineNodeEditor/Styles/Node/ElementNodeHeader.xaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
xmlns:local="clr-namespace:SimpleStateMachineNodeEditor.Styles.Node"
77
mc:Ignorable="d"
88
>
9-
<Border CornerRadius="5,5,0,0" VerticalAlignment="Stretch" Background="{DynamicResource ColorNodeHeader}">
9+
<Border CornerRadius="5,5,0,0" VerticalAlignment="Stretch" >
10+
<Border.Background>
11+
<SolidColorBrush Color="{DynamicResource ColorNodeHeader}" />
12+
</Border.Background>
1013
<Grid>
1114
<Grid.ColumnDefinitions>
1215
<ColumnDefinition Width="*" />
@@ -16,7 +19,7 @@
1619
<RowDefinition />
1720
</Grid.RowDefinitions>
1821
<TextBox Name="TextBox" Grid.Column="0" VerticalAlignment="Center" VerticalContentAlignment="Center" Style="{DynamicResource StyleEmptyTextBox}" HorizontalContentAlignment="Center" BorderThickness="0,0,0,0" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="{DynamicResource ColorNodeHeaderForeground}" Padding="10,2,0,2" ScrollViewer.CanContentScroll="True" HorizontalAlignment="Center" />
19-
<Button Name ="ButtonCollapse" Grid.Column="1" Style="{DynamicResource StyleNodeCollapseButton}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5">
22+
<Button Name ="ButtonCollapse" Grid.Column="1" Style="{DynamicResource StyleNodeCollapseButton}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5">
2023
<Button.RenderTransform>
2124
<TransformGroup>
2225
<RotateTransform x:Name="ButtonRotate" Angle="0" CenterX="4" CenterY="2" />

‎SimpleStateMachineNodeEditor/Styles/Themes/Dark.xaml

+12-11
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<SolidColorBrush x:Key="ColorSelectedElement" Color="#D23030"/>
1414

15-
<SolidColorBrush x:Key="ColorConnect" Color="White"/>
15+
<SolidColorBrush x:Key="ColorConnect" Color="White" />
1616

1717
<SolidColorBrush x:Key="ColorConnector" Color="White"/>
1818

@@ -79,21 +79,22 @@
7979
<!--#endregion Menu-->
8080

8181
<!--#region Node-->
82-
<SolidColorBrush x:Key="ColorNodeBackground" Color="#FF2D2D2D"/>
83-
82+
<Color x:Key="ColorNodeBackground">#E52D2D2D</Color>
8483
<SolidColorBrush x:Key="ColorNodeBorderBrush" Color="LightGray"/>
85-
8684

87-
<SolidColorBrush x:Key="ColorNodeHeader" Color="#FF123D6A"/>
88-
85+
86+
<!--<Color x:Key="ColorNodeHeader" R="18" G="61" B="106" A="200"/>-->
87+
<Color x:Key="ColorNodeHeader">#90123d6a</Color>
88+
<!--<SolidColorBrush x:Key="ColorNodeHeader" Color="#123d6a" Opacity="0.5"/>-->
89+
8990
<SolidColorBrush x:Key="ColorNodeHeaderForeground" Color="White"/>
90-
9191

92-
<SolidColorBrush x:Key="ColorNodeCollapseButtonBackground" Color="White"/>
93-
<SolidColorBrush x:Key="ColorNodeCollapseButtonBorderBrush" Color="White"/>
9492

95-
<SolidColorBrush x:Key="ColorNodeCollapseButtonMouseOverBackground" Color="#D23030"/>
96-
<SolidColorBrush x:Key="ColorNodeCollapseButtonMouseOverBorderBrush" Color="#D23030"/>
93+
<SolidColorBrush x:Key="ColorNodeCollapseButtonBackground" Color="White" />
94+
<SolidColorBrush x:Key="ColorNodeCollapseButtonBorderBrush" Color="White" />
95+
96+
<SolidColorBrush x:Key="ColorNodeCollapseButtonMouseOverBackground" Color="#D23030" />
97+
<SolidColorBrush x:Key="ColorNodeCollapseButtonMouseOverBorderBrush" Color="#D23030" />
9798
<!--#endregion Node-->
9899

99100
</ResourceDictionary>

‎SimpleStateMachineNodeEditor/Styles/Themes/Light.xaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
<SolidColorBrush x:Key="ColorSelectedElement" Color="#D23030"/>
1414

15-
<SolidColorBrush x:Key="ColorConnect" Color="#414141"/>
15+
<SolidColorBrush x:Key="ColorConnect" Color="#98989a"/>
1616

17-
<SolidColorBrush x:Key="ColorConnector" Color="#414141"/>
17+
<SolidColorBrush x:Key="ColorConnector" Color="#98989a"/>
1818

1919
<SolidColorBrush x:Key="ColorConnectorForeground" Color="Black"/>
2020

@@ -76,12 +76,12 @@
7676
<!--#endregion Menu-->
7777

7878
<!--#region Node-->
79-
<SolidColorBrush x:Key="ColorNodeBackground" Color="#eeeef2"/>
80-
79+
80+
<Color x:Key="ColorNodeBackground" >#E5eeeef2</Color>
81+
8182
<SolidColorBrush x:Key="ColorNodeBorderBrush" Color="#c2c3c9"/>
8283

83-
84-
<SolidColorBrush x:Key="ColorNodeHeader" Color="#414141"/>
84+
<Color x:Key="ColorNodeHeader" >#90414141</Color>
8585

8686
<SolidColorBrush x:Key="ColorNodeHeaderForeground" Color="White"/>
8787

‎SimpleStateMachineNodeEditor/View/ViewConnect.xaml

+9-11
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@
66
xmlns:local="clr-namespace:SimpleStateMachineNodeEditor.View"
77
mc:Ignorable="d"
88
d:DesignHeight="450" d:DesignWidth="800" IsHitTestVisible="False">
9-
<Grid>
10-
<Path x:Name="PathElement" StrokeDashCap="Round" StrokeLineJoin="Round" Stroke="{DynamicResource ColorConnect}" StrokeEndLineCap="Round" StrokeStartLineCap="Round">
11-
<Path.Data>
12-
<PathGeometry x:Name="PathGeometryElement">
13-
<PathFigure x:Name="PathFigureElement" IsClosed="False">
14-
<BezierSegment x:Name="BezierSegmentElement"/>
15-
</PathFigure>
16-
</PathGeometry>
17-
</Path.Data>
18-
</Path>
19-
</Grid>
9+
<Path x:Name="PathElement" StrokeDashCap="Round" StrokeLineJoin="Round" Stroke="{DynamicResource ColorConnect}" StrokeEndLineCap="Round" StrokeStartLineCap="Round">
10+
<Path.Data>
11+
<PathGeometry x:Name="PathGeometryElement">
12+
<PathFigure x:Name="PathFigureElement" IsClosed="False">
13+
<BezierSegment x:Name="BezierSegmentElement"/>
14+
</PathFigure>
15+
</PathGeometry>
16+
</Path.Data>
17+
</Path>
2018
</UserControl>

‎SimpleStateMachineNodeEditor/View/ViewConnect.xaml.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ private void SetupBinding()
4848
{
4949
this.WhenActivated(disposable =>
5050
{
51+
Canvas.SetZIndex((UIElement)this.VisualParent, this.ViewModel.FromConnector.Node.Zindex + 1);
52+
5153
this.OneWayBind(this.ViewModel, x => x.Stroke, x => x.PathElement.Stroke).DisposeWith(disposable);
5254

5355
this.OneWayBind(this.ViewModel, x => x.StartPoint, x => x.PathFigureElement.StartPoint).DisposeWith(disposable);
@@ -63,9 +65,6 @@ private void SetupBinding()
6365
this.OneWayBind(this.ViewModel, x => x.FromConnector.NodesCanvas.Scale.Value, x => x.PathElement.StrokeThickness).DisposeWith(disposable);
6466

6567
this.WhenAnyValue(x => x.ViewModel.ToConnector).Where(x=>x!=null).Subscribe(_ => UpdateZindex()).DisposeWith(disposable);
66-
67-
Canvas.SetZIndex((UIElement)this.VisualParent, this.ViewModel.FromConnector.Node.Zindex+1);
68-
6968
});
7069
}
7170

‎SimpleStateMachineNodeEditor/View/ViewLeftConnector.xaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:local="clr-namespace:SimpleStateMachineNodeEditor.View"
77
x:Name="LeftConnector" HorizontalAlignment="Stretch" VerticalAlignment="Top" AllowDrop="True" >
8-
9-
<Grid x:Name="GridElement" Background="{DynamicResource ColorNodeBackground}">
8+
<Grid x:Name="GridElement" Background="#00000000">
109
<Grid.ColumnDefinitions>
1110
<ColumnDefinition Width="Auto" />
1211
<ColumnDefinition />

‎SimpleStateMachineNodeEditor/View/ViewNode.xaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
xmlns:enums="clr-namespace:SimpleStateMachineNodeEditor.Helpers.Enums"
1010
mc:Ignorable="d" Focusable="True" AllowDrop="True" Visibility="Visible">
1111

12-
<Border x:Name="BorderElement" CornerRadius="5,5,5,5" BorderThickness="1,1,1,1" BorderBrush="{DynamicResource ColorNodeBorderBrush}" Background="{DynamicResource ColorNodeBackground}" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="80">
12+
<Border x:Name="BorderElement" CornerRadius="5,5,5,5" BorderThickness="1,1,1,1" BorderBrush="{DynamicResource ColorNodeBorderBrush}" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="80">
13+
<Border.Background>
14+
<SolidColorBrush Color="{DynamicResource ColorNodeBackground}" />
15+
</Border.Background>
1316
<StackPanel Margin="0,0,0,5">
1417
<NodeStyles:ElementNodeHeader x:Name="NodeHeaderElement" />
1518
<!--Grid For Input and Output-->

‎SimpleStateMachineNodeEditor/View/ViewRightConnector.xaml

+11-13
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,15 @@
66
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
77
mc:Ignorable="d"
88
x:Name="RightConnector" HorizontalAlignment="Stretch" VerticalAlignment="Top" BorderThickness="0" AllowDrop="True">
9-
<Border x:Name="BorderElement" CornerRadius="5,5,5,5" Background="{DynamicResource ColorNodeBackground}">
10-
<Grid >
11-
<Grid.ColumnDefinitions>
12-
<ColumnDefinition />
13-
<ColumnDefinition Width="Auto" />
14-
</Grid.ColumnDefinitions>
15-
<Grid.RowDefinitions>
16-
<RowDefinition />
17-
</Grid.RowDefinitions>
18-
<TextBox Name="TextBoxElement" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5,0,5,3" TextWrapping="NoWrap" BorderThickness="0,0,0,0" Background="{x:Null}" BorderBrush="{x:Null}" Style="{DynamicResource StyleEmptyTextBox}"/>
19-
<Ellipse Name="EllipseElement" Grid.Row="0" Grid.Column="1" Margin="0,0,-7,0" HorizontalAlignment="Right" VerticalAlignment="Center" Height="12" Width="12" AllowDrop="True" StrokeThickness="1" />
20-
</Grid>
21-
</Border>
9+
<Grid x:Name="GridElement" Background="#00000000" >
10+
<Grid.ColumnDefinitions>
11+
<ColumnDefinition />
12+
<ColumnDefinition Width="Auto" />
13+
</Grid.ColumnDefinitions>
14+
<Grid.RowDefinitions>
15+
<RowDefinition />
16+
</Grid.RowDefinitions>
17+
<TextBox Name="TextBoxElement" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5,0,5,3" TextWrapping="NoWrap" BorderThickness="0,0,0,0" Background="{x:Null}" BorderBrush="{x:Null}" Style="{DynamicResource StyleEmptyTextBox}"/>
18+
<Ellipse Name="EllipseElement" Grid.Row="0" Grid.Column="1" Margin="0,0,-7,0" HorizontalAlignment="Right" VerticalAlignment="Center" Height="12" Width="12" AllowDrop="True" StrokeThickness="1" />
19+
</Grid>
2220
</UserControl>

‎SimpleStateMachineNodeEditor/View/ViewRightConnector.xaml.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ private void SetupEvents()
9898
{
9999
this.EllipseElement.Events().MouseLeftButtonDown.Subscribe(e => ConnectDrag(e)).DisposeWith(disposable);
100100
this.TextBoxElement.Events().LostFocus.Subscribe(e => Validate(e)).DisposeWith(disposable);
101-
this.BorderElement.Events().PreviewMouseLeftButtonDown.Subscribe(e => ConnectorDrag(e)).DisposeWith(disposable);
102-
this.BorderElement.Events().PreviewDragEnter.Subscribe(e => ConnectorDragEnter(e)).DisposeWith(disposable);
103-
this.BorderElement.Events().PreviewDragOver.Subscribe(e => e.Handled = true).DisposeWith(disposable);
104-
this.BorderElement.Events().PreviewDrop.Subscribe(e => ConnectorDrop(e)).DisposeWith(disposable);
101+
this.GridElement.Events().PreviewMouseLeftButtonDown.Subscribe(e => ConnectorDrag(e)).DisposeWith(disposable);
102+
this.GridElement.Events().PreviewDragEnter.Subscribe(e => ConnectorDragEnter(e)).DisposeWith(disposable);
103+
this.GridElement.Events().PreviewDragOver.Subscribe(e => e.Handled = true).DisposeWith(disposable);
104+
this.GridElement.Events().PreviewDrop.Subscribe(e => ConnectorDrop(e)).DisposeWith(disposable);
105105
});
106106
}
107107
private void OnEventMouseOver(bool value)

‎SimpleStateMachineNodeEditor/ViewModel/NodesCanvas/ViewModelNodesCanvas.cs

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
using SimpleStateMachineNodeEditor.Helpers;
1313
using System.Windows;
1414
using System.Collections.Generic;
15+
using System.Windows.Controls;
16+
using System.Windows.Media;
1517

1618
namespace SimpleStateMachineNodeEditor.ViewModel
1719
{
@@ -88,6 +90,7 @@ private void SetAsStart(ViewModelNode node)
8890
{
8991
node.Input.Visible = false;
9092
node.CanBeDelete = false;
93+
StartState = node;
9194
}
9295

9396
#endregion Setup Nodes

‎SimpleStateMachineNodeEditor/ViewModel/NodesCanvas/ViewModelNodesCanvasCommands.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ private void Open()
333333

334334
var Transitions = stateMachineXElement.Element("Transitions")?.Elements()?.ToList() ?? new List<XElement>();
335335
ViewModelConnect viewModelConnect;
336+
Transitions?.Reverse();
336337
foreach (var transition in Transitions)
337338
{
338339
viewModelConnect = ViewModelConnector.FromXElement(this, transition, out string errorMesage, ConnectsExist);
@@ -412,7 +413,7 @@ private void Save(string fileName)
412413

413414
XElement transitions = new XElement("Transitions");
414415
stateMachineXElement.Add(transitions);
415-
foreach (var transition in Nodes.SelectMany(x => x.Transitions.Where(y => !string.IsNullOrEmpty(y.Name))).Reverse())
416+
foreach (var transition in Nodes.SelectMany(x => x.Transitions.Where(y => !string.IsNullOrEmpty(y.Name))))
416417
{
417418
transitions.Add(transition.ToXElement());
418419
}

0 commit comments

Comments
 (0)