From 06870c1b678cf743c4648d6ba8044ff2d349c627 Mon Sep 17 00:00:00 2001
From: Robert <mail@rbeekman.nl>
Date: Sat, 4 Sep 2021 20:30:26 +0200
Subject: [PATCH] Nodes editor - Use theme color for selectio nrect

---
 .../Artemis.VisualScripting.csproj              |  9 +++++++++
 .../Editor/Styles/VisualScriptPresenter.xaml    | 15 ++++++++++++---
 .../Properties/DesignTimeResources.xaml         |  8 ++++++++
 src/Artemis.VisualScripting/packages.lock.json  | 17 +++++++++--------
 4 files changed, 38 insertions(+), 11 deletions(-)
 create mode 100644 src/Artemis.VisualScripting/Properties/DesignTimeResources.xaml

diff --git a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
index 6ab5e3451..da0811361 100644
--- a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
+++ b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
@@ -36,7 +36,16 @@
   </PropertyGroup>
 
   <ItemGroup>
+  	<Page Include="Properties\DesignTimeResources.xaml" Condition="'$(DesignTime)'=='true' OR ('$(SolutionPath)'!='' AND Exists('$(SolutionPath)') AND '$(BuildingInsideVisualStudio)'!='true' AND '$(BuildingInsideExpressionBlend)'!='true')">
+  	  <Generator>MSBuild:Compile</Generator>
+  	  <SubType>Designer</SubType>
+  	  <ContainsDesignTimeResources>true</ContainsDesignTimeResources>
+  	</Page>
+  </ItemGroup>
+
+	<ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2021.1.0" />
+    <PackageReference Include="MaterialDesignThemes" Version="4.1.0" />
     <PackageReference Include="Ninject" Version="3.3.4" />
     <PackageReference Include="NoStringEvaluating" Version="2.2.1" />
     <PackageReference Include="SkiaSharp" Version="2.80.3" />
diff --git a/src/Artemis.VisualScripting/Editor/Styles/VisualScriptPresenter.xaml b/src/Artemis.VisualScripting/Editor/Styles/VisualScriptPresenter.xaml
index 9c4a725e6..e4e816cd1 100644
--- a/src/Artemis.VisualScripting/Editor/Styles/VisualScriptPresenter.xaml
+++ b/src/Artemis.VisualScripting/Editor/Styles/VisualScriptPresenter.xaml
@@ -2,6 +2,12 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:Artemis.VisualScripting.Editor.Controls">
 
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Teal.xaml" />
+
+    </ResourceDictionary.MergedDictionaries>
     <ControlTemplate x:Key="TemplateVisualScriptPresenter"
                      TargetType="{x:Type controls:VisualScriptPresenter}">
         <Border BorderBrush="{TemplateBinding BorderBrush}"
@@ -29,11 +35,14 @@
                         Background="{TemplateBinding Background}">
 
                     <Border x:Name="PART_SelectionBorder"
-                            Background="#3300FF00"
                             BorderThickness="1"
-                            BorderBrush="#FF00CC00"
+                            BorderBrush="{StaticResource PrimaryHueLightBrush}"
                             CornerRadius="1"
-                            Visibility="Hidden" />
+                            Visibility="Hidden">
+                        <Border.Background>
+                            <SolidColorBrush Color="{DynamicResource Primary400}" Opacity="0.25" />
+                        </Border.Background>
+                    </Border>
 
                     <ItemsControl x:Name="PART_NodeList"
                                   Panel.ZIndex="0">
diff --git a/src/Artemis.VisualScripting/Properties/DesignTimeResources.xaml b/src/Artemis.VisualScripting/Properties/DesignTimeResources.xaml
new file mode 100644
index 000000000..dec7a9dd8
--- /dev/null
+++ b/src/Artemis.VisualScripting/Properties/DesignTimeResources.xaml
@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Teal.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Teal.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Artemis.VisualScripting/packages.lock.json b/src/Artemis.VisualScripting/packages.lock.json
index 577d20ab1..8f10fb4ab 100644
--- a/src/Artemis.VisualScripting/packages.lock.json
+++ b/src/Artemis.VisualScripting/packages.lock.json
@@ -8,6 +8,15 @@
         "resolved": "2021.1.0",
         "contentHash": "n9JSw5Z+F+6gp9vSv4aLH6p/bx3GAYA6FZVq1wJq/TJySv/kPgFKLGFeS7A8Xa5X4/GWorh5gd43yjamUgnBNA=="
       },
+      "MaterialDesignThemes": {
+        "type": "Direct",
+        "requested": "[4.1.0, )",
+        "resolved": "4.1.0",
+        "contentHash": "WqrO9AbtdE4pLPtDk/C5BZRnkgWFwVGyUHWj7tRJrgnKl089DEobVXBCLeqp2mkgBeFHj4Xe3AfWyhmlnO6AZA==",
+        "dependencies": {
+          "MaterialDesignColors": "2.0.1"
+        }
+      },
       "Ninject": {
         "type": "Direct",
         "requested": "[3.3.4, )",
@@ -99,14 +108,6 @@
           "MaterialDesignThemes": "3.2.0"
         }
       },
-      "MaterialDesignThemes": {
-        "type": "Transitive",
-        "resolved": "4.1.0",
-        "contentHash": "WqrO9AbtdE4pLPtDk/C5BZRnkgWFwVGyUHWj7tRJrgnKl089DEobVXBCLeqp2mkgBeFHj4Xe3AfWyhmlnO6AZA==",
-        "dependencies": {
-          "MaterialDesignColors": "2.0.1"
-        }
-      },
       "McMaster.NETCore.Plugins": {
         "type": "Transitive",
         "resolved": "1.4.0",