From fcf0376a9a6dbfdfd6617a1193b585d92cd476be Mon Sep 17 00:00:00 2001
From: Robert <mail@rbeekman.nl>
Date: Sun, 27 Mar 2022 11:48:35 +0200
Subject: [PATCH] Node editor - Tweak pin positions

---
 .../Screens/VisualScripting/NodeScriptView.axaml    |  1 +
 .../Screens/VisualScripting/NodeScriptViewModel.cs  | 13 +++++++++++++
 .../Screens/VisualScripting/NodeView.axaml          |  4 ++--
 .../Screens/VisualScripting/NodeView.axaml.cs       |  1 -
 .../Pins/InputPinCollectionView.axaml               |  2 +-
 .../Pins/OutputPinCollectionView.axaml              |  2 +-
 .../Screens/VisualScripting/VisualScripting.axaml   |  6 +++++-
 .../DataModelEventNodeCustomViewModel.cs            |  4 +---
 .../DataModelNodeCustomViewModel.cs                 |  4 +---
 9 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/Avalonia/Artemis.UI/Screens/VisualScripting/NodeScriptView.axaml b/src/Avalonia/Artemis.UI/Screens/VisualScripting/NodeScriptView.axaml
index a2f6256f3..6c49d2018 100644
--- a/src/Avalonia/Artemis.UI/Screens/VisualScripting/NodeScriptView.axaml
+++ b/src/Avalonia/Artemis.UI/Screens/VisualScripting/NodeScriptView.axaml
@@ -16,6 +16,7 @@
 	<UserControl.KeyBindings>
 <KeyBinding Command="{CompiledBinding History.Undo}" Gesture="Ctrl+Z"></KeyBinding>
 <KeyBinding Command="{CompiledBinding History.Redo}" Gesture="Ctrl+Y"></KeyBinding>
+<KeyBinding Command="{Binding DeleteSelectedNodes}" Gesture="Delete"></KeyBinding>
     </UserControl.KeyBindings>
     <paz:ZoomBorder Name="ZoomBorder"
                     Stretch="None"
diff --git a/src/Avalonia/Artemis.UI/Screens/VisualScripting/NodeScriptViewModel.cs b/src/Avalonia/Artemis.UI/Screens/VisualScripting/NodeScriptViewModel.cs
index 9bdf0eb50..ad51337e7 100644
--- a/src/Avalonia/Artemis.UI/Screens/VisualScripting/NodeScriptViewModel.cs
+++ b/src/Avalonia/Artemis.UI/Screens/VisualScripting/NodeScriptViewModel.cs
@@ -103,6 +103,19 @@ public class NodeScriptViewModel : ActivatableViewModelBase
         set => RaiseAndSetIfChanged(ref _dragViewModel, value);
     }
 
+    public void DeleteSelectedNodes()
+    {
+        List<NodeViewModel> toRemove = NodeViewModels.Where(vm => vm.IsSelected && !vm.Node.IsDefaultNode && !vm.Node.IsExitNode).ToList();
+        if (!toRemove.Any())
+            return;
+
+        using (_nodeEditorService.CreateCommandScope(NodeScript, "Delete nodes"))
+        {
+            foreach (NodeViewModel node in toRemove)
+                _nodeEditorService.ExecuteCommand(NodeScript, new DeleteNode(NodeScript, node.Node));
+        }
+    }
+
     public void UpdateNodeSelection(List<NodeViewModel> nodes, bool expand, bool invert)
     {
         _initialNodeSelection ??= NodeViewModels.Where(vm => vm.IsSelected).ToList();
diff --git a/src/Avalonia/Artemis.UI/Screens/VisualScripting/NodeView.axaml b/src/Avalonia/Artemis.UI/Screens/VisualScripting/NodeView.axaml
index d7b1fb86b..1d58b8175 100644
--- a/src/Avalonia/Artemis.UI/Screens/VisualScripting/NodeView.axaml
+++ b/src/Avalonia/Artemis.UI/Screens/VisualScripting/NodeView.axaml
@@ -41,7 +41,7 @@
                           VerticalAlignment="Top"
                           ColumnDefinitions="*,Auto">
                         <TextBlock VerticalAlignment="Center"
-                                   Margin="5"
+                                   Margin="10 0 0 0"
                                    Text="{CompiledBinding Node.Name}"
                                    ToolTip.Tip="{CompiledBinding Node.Description}">
                         </TextBlock>
@@ -57,7 +57,7 @@
             </Border>
 
 
-            <Grid Grid.Row="1" ColumnDefinitions="Auto,*,Auto" Margin="5">
+            <Grid Grid.Row="1" ColumnDefinitions="Auto,*,Auto" Margin="4">
                 <StackPanel Grid.Column="0" IsVisible="{CompiledBinding HasInputPins}">
                     <ItemsControl Items="{CompiledBinding InputPinViewModels}" Margin="4 0" />
                     <ItemsControl Items="{CompiledBinding InputPinCollectionViewModels}" />
diff --git a/src/Avalonia/Artemis.UI/Screens/VisualScripting/NodeView.axaml.cs b/src/Avalonia/Artemis.UI/Screens/VisualScripting/NodeView.axaml.cs
index 6e0322bde..66f1804f3 100644
--- a/src/Avalonia/Artemis.UI/Screens/VisualScripting/NodeView.axaml.cs
+++ b/src/Avalonia/Artemis.UI/Screens/VisualScripting/NodeView.axaml.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.PanAndZoom;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
diff --git a/src/Avalonia/Artemis.UI/Screens/VisualScripting/Pins/InputPinCollectionView.axaml b/src/Avalonia/Artemis.UI/Screens/VisualScripting/Pins/InputPinCollectionView.axaml
index 2e313b667..8a53266dc 100644
--- a/src/Avalonia/Artemis.UI/Screens/VisualScripting/Pins/InputPinCollectionView.axaml
+++ b/src/Avalonia/Artemis.UI/Screens/VisualScripting/Pins/InputPinCollectionView.axaml
@@ -8,7 +8,7 @@
              x:Class="Artemis.UI.Screens.VisualScripting.Pins.InputPinCollectionView"
              x:DataType="pins:PinCollectionViewModel">
     <StackPanel>
-        <Button Classes="icon-button icon-button-small"
+        <Button Classes="icon-button icon-button-small pin-collection-button"
                 ToolTip.Tip="Add new pin" 
                 Command="{CompiledBinding AddPin}">
             <avalonia:MaterialIcon Kind="Add"></avalonia:MaterialIcon>
diff --git a/src/Avalonia/Artemis.UI/Screens/VisualScripting/Pins/OutputPinCollectionView.axaml b/src/Avalonia/Artemis.UI/Screens/VisualScripting/Pins/OutputPinCollectionView.axaml
index 43d3bfbde..901d5a501 100644
--- a/src/Avalonia/Artemis.UI/Screens/VisualScripting/Pins/OutputPinCollectionView.axaml
+++ b/src/Avalonia/Artemis.UI/Screens/VisualScripting/Pins/OutputPinCollectionView.axaml
@@ -8,7 +8,7 @@
              x:Class="Artemis.UI.Screens.VisualScripting.Pins.OutputPinCollectionView"
              x:DataType="pins:PinCollectionViewModel">
     <StackPanel>
-        <Button Classes="icon-button icon-button-small" 
+        <Button Classes="icon-button icon-button-small pin-collection-button"
                 ToolTip.Tip="Add new pin" 
                 HorizontalAlignment="Right"
                 Command="{CompiledBinding AddPin}">
diff --git a/src/Avalonia/Artemis.UI/Screens/VisualScripting/VisualScripting.axaml b/src/Avalonia/Artemis.UI/Screens/VisualScripting/VisualScripting.axaml
index 9dbad6ef5..636ce43bc 100644
--- a/src/Avalonia/Artemis.UI/Screens/VisualScripting/VisualScripting.axaml
+++ b/src/Avalonia/Artemis.UI/Screens/VisualScripting/VisualScripting.axaml
@@ -6,8 +6,12 @@
         </Border>
     </Design.PreviewWith>
 
+	<Style Selector=":is(Button).pin-collection-button">
+        <!-- <Setter Property="Margin" Value="0 2"/> -->
+    </Style>
+
     <Style Selector="StackPanel#PinContainer">
-        <Setter Property="Height" Value="24" />
+        <Setter Property="Height" Value="26" />
         <Setter Property="Cursor" Value="Hand" />
     </Style>
     <Style Selector="StackPanel#PinContainer Border#PinPoint">
diff --git a/src/Avalonia/Artemis.VisualScripting/Nodes/DataModel/CustomViewModels/DataModelEventNodeCustomViewModel.cs b/src/Avalonia/Artemis.VisualScripting/Nodes/DataModel/CustomViewModels/DataModelEventNodeCustomViewModel.cs
index e0a1b8a34..167e9c2b9 100644
--- a/src/Avalonia/Artemis.VisualScripting/Nodes/DataModel/CustomViewModels/DataModelEventNodeCustomViewModel.cs
+++ b/src/Avalonia/Artemis.VisualScripting/Nodes/DataModel/CustomViewModels/DataModelEventNodeCustomViewModel.cs
@@ -38,7 +38,7 @@ public class DataModelEventNodeCustomViewModel : CustomNodeViewModel
 
             // Subscribe to node changes 
             _node.WhenAnyValue(n => n.Storage).Subscribe(UpdateDataModelPath).DisposeWith(d);
-            UpdateDataModelPath(_node.Storage);
+            this.WhenAnyValue(vm => vm.DataModelPath).Subscribe(ApplyDataModelPath).DisposeWith(d);
 
             Disposable.Create(() =>
             {
@@ -46,8 +46,6 @@ public class DataModelEventNodeCustomViewModel : CustomNodeViewModel
                 _dataModelPath = null;
             }).DisposeWith(d);
         });
-
-        this.WhenAnyValue(vm => vm.DataModelPath).Subscribe(ApplyDataModelPath);
     }
 
     public PluginSetting<bool> ShowFullPaths { get; }
diff --git a/src/Avalonia/Artemis.VisualScripting/Nodes/DataModel/CustomViewModels/DataModelNodeCustomViewModel.cs b/src/Avalonia/Artemis.VisualScripting/Nodes/DataModel/CustomViewModels/DataModelNodeCustomViewModel.cs
index 089121775..a0300bd7f 100644
--- a/src/Avalonia/Artemis.VisualScripting/Nodes/DataModel/CustomViewModels/DataModelNodeCustomViewModel.cs
+++ b/src/Avalonia/Artemis.VisualScripting/Nodes/DataModel/CustomViewModels/DataModelNodeCustomViewModel.cs
@@ -38,7 +38,7 @@ public class DataModelNodeCustomViewModel : CustomNodeViewModel
 
             // Subscribe to node changes 
             _node.WhenAnyValue(n => n.Storage).Subscribe(UpdateDataModelPath).DisposeWith(d);
-            UpdateDataModelPath(_node.Storage);
+            this.WhenAnyValue(vm => vm.DataModelPath).Subscribe(ApplyDataModelPath).DisposeWith(d);
 
             Disposable.Create(() =>
             {
@@ -46,8 +46,6 @@ public class DataModelNodeCustomViewModel : CustomNodeViewModel
                 _dataModelPath = null;
             }).DisposeWith(d);
         });
-
-        this.WhenAnyValue(vm => vm.DataModelPath).Subscribe(ApplyDataModelPath);
     }
 
     public PluginSetting<bool> ShowFullPaths { get; }