Merge pull request #12 from AShifter/master

Master

5 files changed, 20 insertions, 24 deletions

diff --git a/ShiftOS.Engine/ShiftOS.Engine.csproj b/ShiftOS.Engine/ShiftOS.Engine.csproj
index 6740db1..2c9b364 100644
--- a/ShiftOS.Engine/ShiftOS.Engine.csproj
+++ b/ShiftOS.Engine/ShiftOS.Engine.csproj
@@ -34,6 +34,9 @@
     <Reference Include="Magick.NET-Q16-AnyCPU, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
       <HintPath>..\packages\Magick.NET-Q16-AnyCPU.7.0.7.300\lib\net40\Magick.NET-Q16-AnyCPU.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
diff --git a/ShiftOS.Engine/WindowManager/ShiftSkinData.cs b/ShiftOS.Engine/WindowManager/ShiftSkinData.cs
index 2c03123..9f4bf45 100644
--- a/ShiftOS.Engine/WindowManager/ShiftSkinData.cs
+++ b/ShiftOS.Engine/WindowManager/ShiftSkinData.cs
@@ -11,6 +11,9 @@ namespace ShiftOS.Engine.WindowManager
         public static Color btnCloseColor = Color.Empty;
         public static Color btnMaxColor = Color.Empty;
         public static Color btnMinColor = Color.Empty;
+        public static Color btnCloseHoverColor = Color.Empty;
+        public static Color btnMaxHoverColor = Color.Empty;
+        public static Color btnMinHoverColor = Color.Empty;
         public static Color leftSideColor = Color.Empty;
         public static Color rightSideColor = Color.Empty;
         public static Color leftBottomCornerColor = Color.Empty;
diff --git a/ShiftOS.Engine/WindowManager/ShiftWindow.Designer.cs b/ShiftOS.Engine/WindowManager/ShiftWindow.Designer.cs
index 211324c..df479ba 100644
--- a/ShiftOS.Engine/WindowManager/ShiftWindow.Designer.cs
+++ b/ShiftOS.Engine/WindowManager/ShiftWindow.Designer.cs
@@ -161,10 +161,8 @@
             this.btnMax.Size = new System.Drawing.Size(21, 21);
             this.btnMax.TabIndex = 6;
             this.btnMax.TabStop = false;
-            this.btnMax.MouseDown += new System.Windows.Forms.MouseEventHandler(this.maximizebutton_MouseDown);
             this.btnMax.MouseEnter += new System.EventHandler(this.maximizebutton_MouseEnter);
             this.btnMax.MouseLeave += new System.EventHandler(this.maximizebutton_MouseLeave);
-            this.btnMax.MouseUp += new System.Windows.Forms.MouseEventHandler(this.maximizebutton_MouseUp);
             // 
             // btnMin
             // 
@@ -175,10 +173,8 @@
             this.btnMin.Size = new System.Drawing.Size(21, 21);
             this.btnMin.TabIndex = 5;
             this.btnMin.TabStop = false;
-            this.btnMin.MouseDown += new System.Windows.Forms.MouseEventHandler(this.minimizebutton_MouseDown);
             this.btnMin.MouseEnter += new System.EventHandler(this.minimizebutton_MouseEnter);
             this.btnMin.MouseLeave += new System.EventHandler(this.minimizebutton_MouseLeave);
-            this.btnMin.MouseUp += new System.Windows.Forms.MouseEventHandler(this.minimizebutton_MouseUp);
             // 
             // Title
             // 
@@ -203,10 +199,8 @@
             this.btnClose.TabIndex = 4;
             this.btnClose.TabStop = false;
             this.btnClose.Click += new System.EventHandler(this.closebutton_Click);
-            this.btnClose.MouseDown += new System.Windows.Forms.MouseEventHandler(this.closebutton_MouseDown);
             this.btnClose.MouseEnter += new System.EventHandler(this.closebutton_MouseEnter);
             this.btnClose.MouseLeave += new System.EventHandler(this.closebutton_MouseLeave);
-            this.btnClose.MouseUp += new System.Windows.Forms.MouseEventHandler(this.closebutton_MouseUp);
             // 
             // rightSide
             // 
diff --git a/ShiftOS.Engine/WindowManager/ShiftWindow.cs b/ShiftOS.Engine/WindowManager/ShiftWindow.cs
index c091d40..a8b9c79 100644
--- a/ShiftOS.Engine/WindowManager/ShiftWindow.cs
+++ b/ShiftOS.Engine/WindowManager/ShiftWindow.cs
@@ -50,23 +50,25 @@ namespace ShiftOS.Engine.WindowManager
 			=> this.Close();
 
 	    private void closebutton_MouseEnter(object sender, EventArgs e) 
-			=> btnClose.BackColor = Color.Gray;
+			=> btnClose.BackColor = ShiftSkinData.btnCloseHoverColor;
 
-		private void closebutton_MouseLeave(object sender, EventArgs e) 
-			=> btnClose.BackColor = Color.Black;
+        private void closebutton_MouseLeave(object sender, EventArgs e)
+            => btnClose.BackColor = ShiftSkinData.btnCloseColor;
 
 		private void maximizebutton_MouseEnter(object sender, EventArgs e) 
-			=> btnMax.BackColor = Color.Gray;
+			=> btnMax.BackColor = ShiftSkinData.btnMaxHoverColor;
 
-		private void maximizebutton_MouseLeave(object sender, EventArgs e) 
-			=> btnMax.BackColor = Color.Black;
+        private void maximizebutton_MouseLeave(object sender, EventArgs e)
+            => btnMax.BackColor = ShiftSkinData.btnMaxColor;
 
-		private void minimizebutton_MouseEnter(object sender, EventArgs e) 
-			=> btnMin.BackColor = Color.Gray;
+        private void minimizebutton_MouseEnter(object sender, EventArgs e)
+            => btnMin.BackColor = ShiftSkinData.btnMinHoverColor;
+        
 
-		private void minimizebutton_MouseLeave(object sender, EventArgs e) 
-			=> btnMin.BackColor = Color.Black;
+        private void minimizebutton_MouseLeave(object sender, EventArgs e)
+            => btnMin.BackColor = ShiftSkinData.btnMinColor;
 
+        /*
 		private void closebutton_MouseDown(object sender, MouseEventArgs e) 
 			=> btnClose.BackColor = Color.Black;
 
@@ -75,15 +77,8 @@ namespace ShiftOS.Engine.WindowManager
 
 		private void minimizebutton_MouseDown(object sender, MouseEventArgs e) 
 			=> btnMin.BackColor = Color.Black;
+            */
 
-		private void minimizebutton_MouseUp(object sender, MouseEventArgs e) 
-			=> btnMin.BackColor = Color.Gray;
-
-		private void maximizebutton_MouseUp(object sender, MouseEventArgs e) 
-			=> btnMax.BackColor = Color.Gray;
-
-		private void closebutton_MouseUp(object sender, MouseEventArgs e) 
-			=> btnClose.BackColor = Color.Gray;
 	}
 
 	public interface IShiftWindowExtensions
diff --git a/ShiftOS.Engine/packages.config b/ShiftOS.Engine/packages.config
index d376894..2f27f01 100644
--- a/ShiftOS.Engine/packages.config
+++ b/ShiftOS.Engine/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Magick.NET-Q16-AnyCPU" version="7.0.7.300" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
 </packages>
\ No newline at end of file