Merge pull request #9 from AShifter/master

Master

1 files changed, 40 insertions, 24 deletions

diff --git a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs
index 7659601..177942d 100644
--- a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs
+++ b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs
@@ -9,7 +9,6 @@ namespace ShiftOS.Main.ShiftOS.Apps
     public partial class Shifter : UserControl
     {
         public int colorType; //This is a check to see what option was chosen.
-        ShiftSkinData skinConfig = new ShiftSkinData();
         public Shifter()
         {
             InitializeComponent();
@@ -23,27 +22,43 @@ namespace ShiftOS.Main.ShiftOS.Apps
 
         private void setDefaultSkin(object sender, EventArgs e)
         {
-            skinConfig.setBorderColor(Color.FromArgb(64, 64, 64));
-            skinConfig.btnCloseColor = Color.Black;
-            skinConfig.btnMaxColor = Color.Black;
-            skinConfig.btnMinColor = Color.Black;
+            setBorderColor(Color.FromArgb(64, 64, 64));
+            ShiftSkinData.btnCloseColor = Color.Black;
+            ShiftSkinData.btnMaxColor = Color.Black;
+            ShiftSkinData.btnMinColor = Color.Black;
+            button5_Click(sender, e);
         }
 
         private void setColorSkin(object sender, EventArgs e)
         {
-            skinConfig.setBorderColor(Color.Blue);
-            skinConfig.btnCloseColor = Color.Red;
-            skinConfig.btnMaxColor = Color.Yellow;
-            skinConfig.btnMinColor = Color.Green;
+            setBorderColor(Color.Blue);
+            ShiftSkinData.btnCloseColor = Color.Red;
+            ShiftSkinData.btnMaxColor = Color.Yellow;
+            ShiftSkinData.btnMinColor = Color.Green;
+            button5_Click(sender, e);
         }
 
         private void setRandomSkin(object sender, EventArgs e)
         {
             Random rnd = new Random();
-            skinConfig.setBorderColor(Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255)));
-            skinConfig.btnCloseColor = Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255));
-            skinConfig.btnMaxColor = Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255));
-            skinConfig.btnMinColor = Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255));
+            setBorderColor(Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255)));
+            ShiftSkinData.btnCloseColor = Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255));
+            ShiftSkinData.btnMaxColor = Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255));
+            ShiftSkinData.btnMinColor = Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255));
+            button5_Click(sender, e);
+        }
+
+        // SetBorderColor
+        public void setBorderColor(Color borderColor)
+        {
+            ShiftSkinData.leftTopCornerColor = borderColor;
+            ShiftSkinData.titleBarColor = borderColor;
+            ShiftSkinData.rightTopCornerColor = borderColor;
+            ShiftSkinData.leftSideColor = borderColor;
+            ShiftSkinData.rightSideColor = borderColor;
+            ShiftSkinData.leftBottomCornerColor = borderColor;
+            ShiftSkinData.bottomSideColor = borderColor;
+            ShiftSkinData.rightBottomCornerColor = borderColor;
         }
 
         private void button5_Click(object sender, EventArgs e)
@@ -51,17 +66,18 @@ namespace ShiftOS.Main.ShiftOS.Apps
 
             foreach (var window in ShiftWM.Windows)
             {
-                window.Invoke(new Action(() => window.top.BackColor = skinConfig.titleBarColor));
-                window.Invoke(new Action(() => window.topleftcorner.BackColor = skinConfig.leftTopCornerColor));
-                window.Invoke(new Action(() => window.toprightcorner.BackColor = skinConfig.rightTopCornerColor));
-                window.Invoke(new Action(() => window.left.BackColor = skinConfig.leftSideColor));
-                window.Invoke(new Action(() => window.right.BackColor = skinConfig.rightSideColor));
-                window.Invoke(new Action(() => window.bottomleftcorner.BackColor = skinConfig.leftBottomCornerColor));
-                window.Invoke(new Action(() => window.bottom.BackColor = skinConfig.bottomSideColor));
-                window.Invoke(new Action(() => window.bottomrightcorner.BackColor = skinConfig.rightBottomCornerColor));
-                window.Invoke(new Action(() => window.closebutton.BackColor = skinConfig.btnCloseColor));
-                window.Invoke(new Action(() => window.maximizebutton.BackColor = skinConfig.btnMaxColor));
-                window.Invoke(new Action(() => window.minimizebutton.BackColor = skinConfig.btnMinColor));
+                window.Invoke(new Action(() => window.titleBar.BackColor = ShiftSkinData.titleBarColor));
+                window.Invoke(new Action(() => window.leftTopCorner.BackColor = ShiftSkinData.leftTopCornerColor));
+                window.Invoke(new Action(() => window.rightTopCorner.BackColor = ShiftSkinData.rightTopCornerColor));
+                window.Invoke(new Action(() => window.leftSide.BackColor = ShiftSkinData.leftSideColor));
+                window.Invoke(new Action(() => window.rightSide.BackColor = ShiftSkinData.rightSideColor));
+                window.Invoke(new Action(() => window.leftBottomCorner.BackColor = ShiftSkinData.leftBottomCornerColor));
+                window.Invoke(new Action(() => window.bottomSide.BackColor = ShiftSkinData.bottomSideColor));
+                window.Invoke(new Action(() => window.rightBottomCorner.BackColor = ShiftSkinData.rightBottomCornerColor));
+                window.Invoke(new Action(() => window.btnClose.BackColor = ShiftSkinData.btnCloseColor));
+                window.Invoke(new Action(() => window.btnMax.BackColor = ShiftSkinData.btnMaxColor));
+                window.Invoke(new Action(() => window.btnMin.BackColor = ShiftSkinData.btnMinColor));
+                
             }
         }
     }