From bb392ba72dcc81f620c76b3b0d302d4192d1718f Mon Sep 17 00:00:00 2001
From: liam <liam.golly@gmail.com>
Date: Mon, 21 Dec 2020 17:18:05 -0800
Subject: [PATCH] final commit before merge

---
 .idea/.idea.NodeEditor/.idea/workspace.xml | 24 ++++++++++------------
 Controls/Node.xaml                         |  8 ++++----
 Controls/Node.xaml.cs                      |  1 -
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/.idea/.idea.NodeEditor/.idea/workspace.xml b/.idea/.idea.NodeEditor/.idea/workspace.xml
index 6a10738..0866b46 100644
--- a/.idea/.idea.NodeEditor/.idea/workspace.xml
+++ b/.idea/.idea.NodeEditor/.idea/workspace.xml
@@ -30,11 +30,8 @@
   <component name="ChangeListManager">
     <list default="true" id="8d840f1a-4000-4390-ab3f-2383ed6434d5" name="Default Changelist" comment="Updated Paths with a direction enum, and added seaskipper costs enum">
       <change beforePath="$PROJECT_DIR$/.idea/.idea.NodeEditor/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.NodeEditor/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controls/EditorCanvas.xaml" beforeDir="false" afterPath="$PROJECT_DIR$/Controls/EditorCanvas.xaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controls/EditorCanvas.xaml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Controls/EditorCanvas.xaml.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Controls/Node.xaml" beforeDir="false" afterPath="$PROJECT_DIR$/Controls/Node.xaml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Controls/Node.xaml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Controls/Node.xaml.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/MainWindow.xaml" beforeDir="false" afterPath="$PROJECT_DIR$/MainWindow.xaml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -50,7 +47,8 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="HighlightingSettingsPerFile">
-    <setting file="mock://C:/Users/Liam/NodeEditor/Controls/Node.xaml.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Controls/Node.xaml.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Extensions/Modes.cs" root0="FORCE_HIGHLIGHTING" />
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
@@ -63,8 +61,8 @@
         <option value="$PROJECT_DIR$/NodeEditor.csproj" />
         <option value="$PROJECT_DIR$/Controls/EditorCanvas.xaml.cs" />
         <option value="$PROJECT_DIR$/Controls/EditorCanvas.xaml" />
-        <option value="$PROJECT_DIR$/Controls/Node.xaml.cs" />
         <option value="$PROJECT_DIR$/Controls/Node.xaml" />
+        <option value="$PROJECT_DIR$/Controls/Node.xaml.cs" />
       </list>
     </option>
   </component>
@@ -209,22 +207,22 @@
     <option name="LAST_COMMIT_MESSAGE" value="Hopefully fixed runtime identifiers stopping the program from running." />
   </component>
   <component name="WindowStateProjectService">
-    <state width="914" height="320" key="GridCell.Tab.0.bottom" timestamp="1608587216769">
+    <state width="1877" height="320" key="GridCell.Tab.0.bottom" timestamp="1608598829102">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="914" height="320" key="GridCell.Tab.0.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1608587216769" />
-    <state width="914" height="320" key="GridCell.Tab.0.center" timestamp="1608587216769">
+    <state width="1877" height="320" key="GridCell.Tab.0.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1608598829102" />
+    <state width="1877" height="320" key="GridCell.Tab.0.center" timestamp="1608598829102">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="914" height="320" key="GridCell.Tab.0.center/0.0.1920.1160@0.0.1920.1160" timestamp="1608587216769" />
-    <state width="914" height="320" key="GridCell.Tab.0.left" timestamp="1608587216769">
+    <state width="1877" height="320" key="GridCell.Tab.0.center/0.0.1920.1160@0.0.1920.1160" timestamp="1608598829102" />
+    <state width="1877" height="320" key="GridCell.Tab.0.left" timestamp="1608598829102">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="914" height="320" key="GridCell.Tab.0.left/0.0.1920.1160@0.0.1920.1160" timestamp="1608587216769" />
-    <state width="914" height="320" key="GridCell.Tab.0.right" timestamp="1608587216769">
+    <state width="1877" height="320" key="GridCell.Tab.0.left/0.0.1920.1160@0.0.1920.1160" timestamp="1608598829102" />
+    <state width="1877" height="320" key="GridCell.Tab.0.right" timestamp="1608598829102">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="914" height="320" key="GridCell.Tab.0.right/0.0.1920.1160@0.0.1920.1160" timestamp="1608587216769" />
+    <state width="1877" height="320" key="GridCell.Tab.0.right/0.0.1920.1160@0.0.1920.1160" timestamp="1608598829102" />
     <state x="0" y="228" key="SettingsEditor" timestamp="1608586092924">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
diff --git a/Controls/Node.xaml b/Controls/Node.xaml
index 5bd1371..b52e9d9 100644
--- a/Controls/Node.xaml
+++ b/Controls/Node.xaml
@@ -7,7 +7,7 @@
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800">
 
-    <Button Height="10" Width="10"
+    <Button Height="7" Width="7"
             HorizontalAlignment="Left"
             VerticalAlignment="Top">
         <Button.Template>
@@ -17,9 +17,9 @@
                              StrokeThickness="0">
                         <Ellipse.Fill>
                             <RadialGradientBrush>
-                                <GradientStop Offset="0" Color="Gray"/>
-                                <GradientStop Offset="1" Color="Gray"/>
-                                <GradientStop Offset="1" Color="DarkGray"/>
+                                <GradientStop Offset="0" Color="Red"/>
+                                <GradientStop Offset="1" Color="Red"/>
+                                <GradientStop Offset="1" Color="DarkRed"/>
                                 <RadialGradientBrush.Transform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleY="0.65"/>
diff --git a/Controls/Node.xaml.cs b/Controls/Node.xaml.cs
index 0195561..c1621c0 100644
--- a/Controls/Node.xaml.cs
+++ b/Controls/Node.xaml.cs
@@ -33,7 +33,6 @@ namespace NodeEditor.Controls
             Desc = desc;
             InitializeComponent();
         }
-
         public static int GetIndexOf(Node node)
         {
             if (node != null)