Updated my fork!

Conflicts:
	ShiftOS.Engine/ShiftOS.Engine.csproj
	ShiftOS.Engine/Terminal/Commands/Hello.cs
	ShiftOS.Engine/Terminal/TerminalBackend.cs
	ShiftOS.Engine/Terminal/TerminalCommand.cs
	ShiftOS.Main/ShiftOS.Main.csproj
	ShiftOS.Main/ShiftOS/Apps/Terminal.cs
	ShiftOS.Main/ShiftOS/Desktop.cs

1 files changed, 50 insertions, 54 deletions

diff --git a/ShiftOS.Engine/WindowManager/ShiftWindow.cs b/ShiftOS.Engine/WindowManager/ShiftWindow.cs
index c091d40..e407e33 100644
--- a/ShiftOS.Engine/WindowManager/ShiftWindow.cs
+++ b/ShiftOS.Engine/WindowManager/ShiftWindow.cs
@@ -1,72 +1,76 @@
 using System;
-using System.Drawing;
 using System.Linq;
-using System.Windows.Forms;
 using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using ShiftOS.Engine.Misc;
 
 namespace ShiftOS.Engine.WindowManager
 {
-    public partial class ShiftWindow : Form
-    {
-		public uint Id { get; private set; }
+	public partial class ShiftWindow : Form
+	{
+		const int WmNclbuttondown = 0xA1;
+		const int HtCaption = 0x2;
+
+		public ShiftWindow()
+		{
+			InitializeComponent();
+		}
 
-	    public UserControl ChildControl { get; set; }
+		public uint Id { get; private set; }
 
-	    public ShiftWindow()
-        {
-            InitializeComponent();
-        }
+		public UserControl ChildControl { get; set; }
 
-	    public uint SetId()
-	    {
+		public uint SetId()
+		{
 			do
 			{
-				Id = (uint)Tools.Rnd.Next(100000, 999999);
-			}
-			while (ShiftWM.Windows.FirstOrDefault(w => w.Id == Id) != null);
+				Id = (uint) Tools.Rnd.Next(100000, 999999);
+			} while (ShiftWM.Windows.FirstOrDefault(w => w.Id == Id) != null);
 
-		    return Id;
-	    }
+			return Id;
+		}
 
-		private const int WM_NCLBUTTONDOWN = 0xA1;
-	    private const int HT_CAPTION = 0x2;
+		[DllImport("user32.dll")]
+		static extern int SendMessage(
+			IntPtr hWnd,
+			int msg,
+			int wParam,
+			int lParam);
 
-        [DllImportAttribute("user32.dll")]
-        private static extern int SendMessage(IntPtr hWnd,
-                        int Msg, int wParam, int lParam);
+		[DllImport("user32.dll")]
+		static extern bool ReleaseCapture();
 
-        [DllImportAttribute("user32.dll")]
-        private static extern bool ReleaseCapture();
+		void Programtopbar_drag(object sender, MouseEventArgs e)
+		{
+			if (e.Button != MouseButtons.Left) return;
 
-        private void Programtopbar_drag(object sender, MouseEventArgs e)
-        {
-	        if (e.Button != MouseButtons.Left) return;
+			ReleaseCapture();
+			SendMessage(Handle, WmNclbuttondown, HtCaption, 0);
+		}
 
-	        ReleaseCapture();
-	        SendMessage(Handle, WM_NCLBUTTONDOWN, HT_CAPTION, 0);
-        }
+		void closebutton_Click(object sender, EventArgs e)
+			=> Close();
 
-        private void closebutton_Click(object sender, EventArgs e) 
-			=> this.Close();
+		void closebutton_MouseEnter(object sender, EventArgs e)
+			=> btnClose.BackColor = ShiftSkinData.BtnCloseHoverColor;
 
-	    private void closebutton_MouseEnter(object sender, EventArgs e) 
-			=> btnClose.BackColor = Color.Gray;
+		void closebutton_MouseLeave(object sender, EventArgs e)
+			=> btnClose.BackColor = ShiftSkinData.BtnCloseColor;
 
-		private void closebutton_MouseLeave(object sender, EventArgs e) 
-			=> btnClose.BackColor = Color.Black;
+		void maximizebutton_MouseEnter(object sender, EventArgs e)
+			=> btnMax.BackColor = ShiftSkinData.BtnMaxHoverColor;
 
-		private void maximizebutton_MouseEnter(object sender, EventArgs e) 
-			=> btnMax.BackColor = Color.Gray;
+		void maximizebutton_MouseLeave(object sender, EventArgs e)
+			=> btnMax.BackColor = ShiftSkinData.BtnMaxColor;
 
-		private void maximizebutton_MouseLeave(object sender, EventArgs e) 
-			=> btnMax.BackColor = Color.Black;
+		void minimizebutton_MouseEnter(object sender, EventArgs e)
+			=> btnMin.BackColor = ShiftSkinData.BtnMinHoverColor;
 
-		private void minimizebutton_MouseEnter(object sender, EventArgs e) 
-			=> btnMin.BackColor = Color.Gray;
 
-		private void minimizebutton_MouseLeave(object sender, EventArgs e) 
-			=> btnMin.BackColor = Color.Black;
+		void minimizebutton_MouseLeave(object sender, EventArgs e)
+			=> btnMin.BackColor = ShiftSkinData.BtnMinColor;
 
+		/*
 		private void closebutton_MouseDown(object sender, MouseEventArgs e) 
 			=> btnClose.BackColor = Color.Black;
 
@@ -75,19 +79,11 @@ 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
 	{
 		void OnLoaded(ShiftWindow window);
 	}
-}
+}
\ No newline at end of file