diff options
| author | FloppyDiskDrive <[email protected]> | 2017-11-21 17:57:20 -0600 |
|---|---|---|
| committer | FloppyDiskDrive <[email protected]> | 2017-11-21 17:57:20 -0600 |
| commit | 277d5c79e703a287ff11b990822b66e180cd1253 (patch) | |
| tree | 83b655949f52cc0ba8478acdf7cd4ed25a761d91 | |
| parent | 50ba8da32176b8ca319f930bde3c6529ad6825ff (diff) | |
| parent | 805402b60fcc2afd4f2403bb5e93940ecb83fe33 (diff) | |
| download | shiftos-rewind-277d5c79e703a287ff11b990822b66e180cd1253.tar.gz shiftos-rewind-277d5c79e703a287ff11b990822b66e180cd1253.tar.bz2 shiftos-rewind-277d5c79e703a287ff11b990822b66e180cd1253.zip | |
Merge branch 'master' of https://github.com/ShiftOS-Rewind/ShiftOS
| -rw-r--r-- | ShiftOS.Engine/WindowManager/ShiftSkinData.cs | 6 | ||||
| -rw-r--r-- | ShiftOS.Engine/WindowManager/ShiftWM.cs | 11 | ||||
| -rw-r--r-- | ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs | 12 |
3 files changed, 18 insertions, 11 deletions
diff --git a/ShiftOS.Engine/WindowManager/ShiftSkinData.cs b/ShiftOS.Engine/WindowManager/ShiftSkinData.cs index 2f76c1b..165f5bb 100644 --- a/ShiftOS.Engine/WindowManager/ShiftSkinData.cs +++ b/ShiftOS.Engine/WindowManager/ShiftSkinData.cs @@ -2,9 +2,9 @@ namespace ShiftOS.Engine.WindowManager { - public abstract class ShiftSkinData - { - // ColorData + public abstract class ShiftSkinData + { + // ColorData public static Color LeftTopCornerColor = Color.Empty; public static Color TitleBarColor = Color.Empty; public static Color RightTopCornerColor = Color.Empty; diff --git a/ShiftOS.Engine/WindowManager/ShiftWM.cs b/ShiftOS.Engine/WindowManager/ShiftWM.cs index fa16cf9..59322c1 100644 --- a/ShiftOS.Engine/WindowManager/ShiftWM.cs +++ b/ShiftOS.Engine/WindowManager/ShiftWM.cs @@ -46,10 +46,13 @@ namespace ShiftOS.Engine.WindowManager if (ShiftSkinData.TitleBarColor == Color.Empty) { var borderColor = Color.FromArgb(64, 64, 64); - ShiftSkinData.BtnCloseColor = Color.Black; - ShiftSkinData.BtnMaxColor = Color.Black; - ShiftSkinData.BtnMinColor = Color.Black; - ShiftSkinData.LeftTopCornerColor = borderColor; + ShiftSkinData.BtnCloseColor = Color.Black; + ShiftSkinData.BtnCloseHoverColor = Color.FromArgb(40, 40, 40); + ShiftSkinData.BtnMaxColor = Color.Black; + ShiftSkinData.BtnMaxHoverColor = Color.FromArgb(40, 40, 40); + ShiftSkinData.BtnMinColor = Color.Black; + ShiftSkinData.BtnMinHoverColor = Color.FromArgb(40, 40, 40); + ShiftSkinData.LeftTopCornerColor = borderColor; ShiftSkinData.TitleBarColor = borderColor; ShiftSkinData.RightTopCornerColor = borderColor; ShiftSkinData.LeftSideColor = borderColor; diff --git a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs index 1f31ae3..bf116e9 100644 --- a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs +++ b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs @@ -26,11 +26,15 @@ namespace ShiftOS.Main.ShiftOS.Apps.ShifterStuff void SetDefaultSkin(object sender, EventArgs e) { + int offset = 30; SetBorderColor(Color.FromArgb(64, 64, 64)); - ShiftSkinData.BtnCloseColor = Color.Black; - ShiftSkinData.BtnMaxColor = Color.Black; - ShiftSkinData.BtnMinColor = Color.Black; - button5_Click(sender, e); + ShiftSkinData.BtnCloseColor = Color.Black; + ShiftSkinData.BtnCloseHoverColor = Color.FromArgb(40, 40, 40); + ShiftSkinData.BtnMaxColor = Color.Black; + ShiftSkinData.BtnMaxHoverColor = Color.FromArgb(40, 40, 40); + ShiftSkinData.BtnMinColor = Color.Black; + ShiftSkinData.BtnMinHoverColor = Color.FromArgb(40, 40, 40); + button5_Click(sender, e); } void SetColorSkin(object sender, EventArgs e) |