Merge pull request #9 from AShifter/master

Master

1 files changed, 33 insertions, 4 deletions

diff --git a/ShiftOS.Engine/WindowManager/ShiftWM.cs b/ShiftOS.Engine/WindowManager/ShiftWM.cs
index 594848a..64b84f9 100644
--- a/ShiftOS.Engine/WindowManager/ShiftWM.cs
+++ b/ShiftOS.Engine/WindowManager/ShiftWM.cs
@@ -33,13 +33,42 @@ namespace ShiftOS.Engine.WindowManager
 	        {
 		        Text = title,
 		        Title = {Text = title}
-	        };
+            };
+
+	        app.Width = content.Width + app.leftSide.Width + app.rightSide.Width;
+            app.Height = content.Height + app.bottomSide.Height + app.titleBar.Height;
+
+            if (ShiftSkinData.titleBarColor == Color.Empty)
+            {
+                Color borderColor = Color.FromArgb(64, 64, 64);
+                ShiftSkinData.btnCloseColor = Color.Black;
+                ShiftSkinData.btnMaxColor = Color.Black;
+                ShiftSkinData.btnMinColor = Color.Black;
+                ShiftSkinData.leftTopCornerColor = borderColor;
+                ShiftSkinData.titleBarColor = borderColor;
+                ShiftSkinData.rightTopCornerColor = borderColor;
+                ShiftSkinData.leftSideColor = borderColor;
+                ShiftSkinData.rightSideColor = borderColor;
+                ShiftSkinData.leftBottomCornerColor = borderColor;
+                ShiftSkinData.bottomSideColor = borderColor;
+                ShiftSkinData.rightBottomCornerColor = borderColor;
+            }
 
-	        app.Width = content.Width + app.left.Width + app.right.Width;
-            app.Height = content.Height + app.bottom.Height + app.top.Height;
+            app.btnClose.BackColor = ShiftSkinData.btnCloseColor;
+            app.btnMax.BackColor = ShiftSkinData.btnMaxColor;
+            app.btnMin.BackColor = ShiftSkinData.btnMinColor;
+            app.leftTopCorner.BackColor = ShiftSkinData.leftTopCornerColor;
+            app.titleBar.BackColor = ShiftSkinData.titleBarColor;
+            app.rightTopCorner.BackColor = ShiftSkinData.rightTopCornerColor;
+            app.leftSide.BackColor = ShiftSkinData.leftSideColor;
+            app.rightSide.BackColor = ShiftSkinData.rightSideColor;
+            app.leftBottomCorner.BackColor = ShiftSkinData.leftBottomCornerColor;
+            app.bottomSide.BackColor = ShiftSkinData.bottomSideColor;
+            app.rightBottomCorner.BackColor = ShiftSkinData.rightBottomCornerColor;
+            
 
             // Icon Setup
-	        if (icon == null)
+            if (icon == null)
 	        {
 		        app.programIcon.Hide();
 		        app.programIcon.Image = Properties.Resources.nullIcon;