some fix

Author: RomanSoloweow

.gitignore

@@ -337,4 +337,6 @@ ASALocalRun/
 .localhistory/
 
 # BeatPulse healthcheck temp database
-healthchecksdb
+healthchecksdb
+
+CodeMap1.dgml

SimpleStateMachineNodeEditor/App.xaml

@@ -48,7 +48,6 @@
                 <ResourceDictionary Source="Styles/MainWindow/CustomWindowTemplate.xaml"/>
 
                     <!--#region      Header-->
-                <ResourceDictionary Source="Styles/MainWindow/ToolBar/ToolButtonTemplate.xaml"/>
                 <ResourceDictionary Source="Styles/MainWindow/ToolBar/TemplateSeparator.xaml"/>
                 <ResourceDictionary Source="Styles/MainWindow/ToolBarTemplate.xaml"/>
                 <ResourceDictionary Source="Styles/MainWindow/Header/StyleHeaderButton.xaml"/>

SimpleStateMachineNodeEditor/README.txt

@@ -4,6 +4,7 @@ Ctrl + Shift + S = Save As
 Ctrl + Shift + O = Open
 Ctrl + Shift + N = New
 Alt + F4 = Exit
+Ctrl + Shift + Alt + P = Export to PNG
 Ctrl + Shift + Alt + J = Export to JPEG
 Ctrl + Z = Undo
 Ctrl + Y = Redo

SimpleStateMachineNodeEditor/SimpleStateMachineNodeEditor.csproj

@@ -44,7 +44,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ReactiveUI" Version="11.4.1" />
     <PackageReference Include="ReactiveUI.Events.WPF" Version="11.4.1" />
     <PackageReference Include="ReactiveUI.Fody" Version="11.4.1" />

SimpleStateMachineNodeEditor/Styles/MainWindow/ToolBar/ToolButtonTemplate.xaml

@@ -11,7 +11,10 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
-                    <Border x:Name="border"  BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+                    <Border x:Name="border"  BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True" >
+                        <Border.ContextMenu>
+                            <ContextMenu Visibility="Collapsed"/>
+                        </Border.ContextMenu>
                         <ScrollViewer x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
                     </Border>
                 </ControlTemplate>

SimpleStateMachineNodeEditor/Styles/StyleEmptyTextBox.xaml

@@ -49,7 +49,7 @@
                                 <Rectangle Fill="{DynamicResource IconExportScheme}" Height="15" Width="15"/>
                             </MenuItem.Icon>
                             <!--<MenuItem Header="Export to PNG" x:Name="ItemExportToPNG" Style="{DynamicResource StyleMenuItem}"/>-->
-                            <MenuItem Header="Export to JPEG" x:Name="ItemExportToJPEG" Style="{DynamicResource StyleMenuItem}"/>
+                            <MenuItem Header="Export to PNG" x:Name="ItemExportToPNG" Style="{DynamicResource StyleMenuItem}"/>
                         </MenuItem>
                         <Separator Background="{DynamicResource ColorSeparator}"/>
                         <MenuItem Header="Exit"  x:Name="ItemExit" InputGestureText="Alt+F4"   Style="{DynamicResource StyleMenuItem}">
@@ -133,7 +133,7 @@
                     <Button x:Name="ButtonSaveAs" ToolTip="Save As... (Ctrl+Shift+S)" Style="{DynamicResource StyleHeaderButton}" Background="{DynamicResource ColorWindowHeader}" BorderBrush="{DynamicResource ColorWindowHeaderButtonBackgroundMouseOver}">
                         <Rectangle Fill="{DynamicResource IconSaveAs}" Height="15" Width="15"/>
                     </Button>
-                    <Button x:Name="ButtonExportToJPEG" ToolTip="Export To JPEG.. (Ctrl+Shift+Alt+J)" Style="{DynamicResource StyleHeaderButton}" Background="{DynamicResource ColorWindowHeader}" BorderBrush="{DynamicResource ColorWindowHeaderButtonBackgroundMouseOver}">
+                    <Button x:Name="ButtonExportToPNG" ToolTip="Export To PNG.. (Ctrl+Shift+Alt+P)" Style="{DynamicResource StyleHeaderButton}" Background="{DynamicResource ColorWindowHeader}" BorderBrush="{DynamicResource ColorWindowHeaderButtonBackgroundMouseOver}">
                         <Rectangle Fill="{DynamicResource IconExportScheme}" Height="15" Width="15"/>
                     </Button>
                     <Separator Grid.Column="5" Style="{DynamicResource TemplateSeparator}" Height="Auto" BorderThickness="0,0,1,0" />
@@ -247,5 +247,6 @@
         <KeyBinding x:Name="BindingNew"     Gesture="Ctrl+Shift+N"/>
         <KeyBinding x:Name="BindingExit"    Gesture="Alt+F4"/>
         <KeyBinding x:Name="BindingExportToJPEG"   Gesture="Ctrl+Shift+Alt+J"/>
+        <KeyBinding x:Name="BindingExportToPNG"   Gesture="Ctrl+Shift+Alt+P"/>
     </Window.InputBindings>
 </Window>

SimpleStateMachineNodeEditor/View/MainWindow.xaml

@@ -88,9 +88,11 @@ private void SetupBinding()
                 this.BindCommand(this.ViewModel, x => x.NodesCanvas.CommandRedo,  x => x.ItemRedo).DisposeWith(disposable); 
                 this.BindCommand(this.ViewModel, x => x.NodesCanvas.CommandRedo,  x => x.ButtonRedo).DisposeWith(disposable);
 
+                this.BindCommand(this.ViewModel, x => x.NodesCanvas.CommandExportToPNG, x => x.BindingExportToPNG).DisposeWith(disposable);
+                this.BindCommand(this.ViewModel, x => x.NodesCanvas.CommandExportToPNG, x => x.ItemExportToPNG).DisposeWith(disposable);
+                this.BindCommand(this.ViewModel, x => x.NodesCanvas.CommandExportToPNG, x => x.ButtonExportToPNG).DisposeWith(disposable);
+
                 this.BindCommand(this.ViewModel, x => x.NodesCanvas.CommandExportToJPEG, x => x.BindingExportToJPEG).DisposeWith(disposable);
-                this.BindCommand(this.ViewModel, x => x.NodesCanvas.CommandExportToJPEG, x => x.ItemExportToJPEG).DisposeWith(disposable);
-                this.BindCommand(this.ViewModel, x => x.NodesCanvas.CommandExportToJPEG, x => x.ButtonExportToJPEG).DisposeWith(disposable);
 
                 this.BindCommand(this.ViewModel, x => x.NodesCanvas.CommandNew, x => x.BindingNew).DisposeWith(disposable);
                 this.BindCommand(this.ViewModel, x => x.NodesCanvas.CommandNew, x => x.ItemNew).DisposeWith(disposable);

SimpleStateMachineNodeEditor/View/MainWindow.xaml.cs

@@ -115,7 +115,7 @@ private void SetupSubscriptions()
             {
                 this.WhenAnyValue(x => x.ViewModel.Selector.Size).WithoutParameter().InvokeCommand(ViewModel, x => x.CommandSelectorIntersect).DisposeWith(disposable);
                 this.WhenAnyValue(x => x.ViewModel.Cutter.EndPoint).WithoutParameter().InvokeCommand(ViewModel, x => x.CommandCutterIntersect).DisposeWith(disposable);
-                this.WhenAnyValue(x => x.ViewModel.JPEGPath).Where(x => !string.IsNullOrEmpty(x)).Subscribe(value => SaveCanvasToImage(value, ImageFormats.JPEG)).DisposeWith(disposable);
+                this.WhenAnyValue(x => x.ViewModel.ImagePath).Where(x => !string.IsNullOrEmpty(x)).Subscribe(value => SaveCanvasToImage(value, ImageFormats.JPEG)).DisposeWith(disposable);
             });
         }
 

SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml.cs

@@ -48,10 +48,11 @@ private void SetupSubscriptions()
 
             if (this.Name!="Input")
             {
+                this.WhenAnyValue(x => x.Node.IsCollapse).Subscribe(value => UpdateSubscriptionForPosition(value));
                 if (this.Name != "Output")
                 {
                     this.WhenAnyValue(x => x.Node.Transitions.Count).Subscribe(x => UpdatePositionOnTransitionCountChange());
-                    this.WhenAnyValue(x => x.Node.IsCollapse).Subscribe(value => UpdateSubscriptionForPosition(value));
+                   
                 }
 
             }