Merge pull request #5 from shiftos-game/master

merge

1 files changed, 149 insertions, 0 deletions

diff --git a/ShiftOS_TheReturn/Skinning.cs b/ShiftOS_TheReturn/Skinning.cs
index e00a2ef..e7ebbc7 100644
--- a/ShiftOS_TheReturn/Skinning.cs
+++ b/ShiftOS_TheReturn/Skinning.cs
@@ -575,6 +575,15 @@ namespace ShiftOS.Engine
         public Color TitleBackgroundColor = TitleBG;
 
         [ShifterMeta("Windows")]
+        [ShifterCategory("Titlebar")]
+        [ShifterName("Title Inactive Background Color")]
+        [RequiresUpgrade("shift_titlebar;shift_states")]
+        [ShifterDescription("The color of the titlebar's background when the window isn't active.")]
+        public Color TitleInactiveBackgroundColor = Skin.DefaultBackground;
+
+
+
+        [ShifterMeta("Windows")]
         [ShifterCategory("Window border")]
         [ShifterName("Left Border Background")]
         [RequiresUpgrade("shift_window_borders")]
@@ -583,11 +592,27 @@ namespace ShiftOS.Engine
 
         [ShifterMeta("Windows")]
         [ShifterCategory("Window border")]
+        [ShifterName("Left Border Inactive Background")]
+        [RequiresUpgrade("shift_window_borders;shift_states")]
+        [ShifterDescription("The background color for the left border when the window is inactive.")]
+        public Color BorderInactiveLeftBackground = DefaultBackground;
+
+
+        [ShifterMeta("Windows")]
+        [ShifterCategory("Window border")]
         [ShifterName("Right Border Background")]
         [RequiresUpgrade("shift_window_borders")]
         [ShifterDescription("The background color for the right border.")]
         public Color BorderRightBackground = TitleBG;
 
+        [ShifterMeta("Windows")]
+        [ShifterCategory("Window border")]
+        [ShifterName("Right Border Inactive Background")]
+        [RequiresUpgrade("shift_window_borders;shift_states")]
+        [ShifterDescription("The background color for the right border when the window is inactive.")]
+        public Color BorderInactiveRightBackground = DefaultBackground;
+
+
         [ShifterMeta("Desktop")]
         [ShifterCategory("Panel buttons")]
         [RequiresUpgrade("shift_panel_buttons")]
@@ -602,6 +627,21 @@ namespace ShiftOS.Engine
         [ShifterDescription("The background color for the bottom border.")]
         public Color BorderBottomBackground = TitleBG;
 
+        [ShifterMeta("Windows")]
+        [ShifterCategory("Window border")]
+        [ShifterName("Bottom Border Inactive Background")]
+        [RequiresUpgrade("shift_window_borders;shift_states")]
+        [ShifterDescription("The background color for the bottom border when the window is inactive.")]
+        public Color BorderInactiveBottomBackground = DefaultBackground;
+
+        [ShifterMeta("Windows")]
+        [ShifterCategory("Window border")]
+        [ShifterName("Use Inactive Border Assets?")]
+        [RequiresUpgrade("shift_window_borders;shift_states")]
+        [ShifterDescription("Do you want to use separate colors and images for inactive Window Borders?")]
+        public bool RenderInactiveBorders = false;
+
+
         [ShifterMeta("Desktop")]
         [ShifterCategory("Panel buttons")]
         [ShifterName("Panel button holder from left")]
@@ -611,11 +651,20 @@ namespace ShiftOS.Engine
 
         [ShifterMeta("Windows")]
         [ShifterCategory("Window border")]
+        [ShifterName("Bottom Left Border Inactive Background")]
+        [RequiresUpgrade("shift_window_borders;shift_states")]
+        [ShifterDescription("The background color for the bottom left border when the window is inactive.")]
+        public Color BorderInactiveBottomLeftBackground = DefaultBackground;
+
+
+        [ShifterMeta("Windows")]
+        [ShifterCategory("Window border")]
         [ShifterName("Bottom Left Border Background")]
         [RequiresUpgrade("shift_window_borders")]
         [ShifterDescription("The background color for the bottom left border.")]
         public Color BorderBottomLeftBackground = TitleBG;
 
+
         [ShifterMeta("Windows")]
         [ShifterCategory("Window border")]
         [ShifterName("Bottom Right Border Background")]
@@ -624,6 +673,14 @@ namespace ShiftOS.Engine
         public Color BorderBottomRightBackground = TitleBG;
 
         [ShifterMeta("Windows")]
+        [ShifterCategory("Window border")]
+        [ShifterName("Bottom Right Border Inactive Background")]
+        [RequiresUpgrade("shift_window_borders;shift_states")]
+        [ShifterDescription("The background color for the bottom right border when the window is inactive.")]
+        public Color BorderInactiveBottomRightBackground = DefaultBackground;
+
+
+        [ShifterMeta("Windows")]
         [ShifterCategory("Title Buttons")]
         [ShifterName("Close Button Color")]
         [RequiresUpgrade("shift_title_buttons")]
@@ -1135,6 +1192,14 @@ namespace ShiftOS.Engine
 
         [ShifterMeta("Windows")]
         [ShifterCategory("Titlebar")]
+        [ShifterName("Titlebar inactive background image")]
+        [Image("titlebarinactive")]
+        [RequiresUpgrade("skinning;shift_titlebar;shift_states")]
+        public byte[] TitleBarInactiveBackground = null;
+
+
+        [ShifterMeta("Windows")]
+        [ShifterCategory("Titlebar")]
         [RequiresUpgrade("shift_titlebar")]
         [ShifterName("Show title corners?")]
         [ShifterDescription("If checked, a left and a right section will appear on the titlebar which is useful for rounded corners, padding, or other useful properties.")]
@@ -1150,6 +1215,15 @@ namespace ShiftOS.Engine
 
         [ShifterMeta("Windows")]
         [ShifterCategory("Titlebar")]
+        [RequiresUpgrade("shift_titlebar;shift_states")]
+        [ShifterFlag("ShowTitleCorners", true)]
+        [ShifterName("Title left inactive background color")]
+        [ShifterDescription("What color should be used for the left title corner when the window is inactive?")]
+        public Color TitleInactiveLeftCornerBackground = DefaultBackground;
+
+
+        [ShifterMeta("Windows")]
+        [ShifterCategory("Titlebar")]
         [RequiresUpgrade("shift_titlebar")]
         [ShifterFlag("ShowTitleCorners", true)]
         [ShifterName("Title right background color")]
@@ -1158,6 +1232,15 @@ namespace ShiftOS.Engine
 
         [ShifterMeta("Windows")]
         [ShifterCategory("Titlebar")]
+        [RequiresUpgrade("shift_titlebar;shift_states")]
+        [ShifterFlag("ShowTitleCorners", true)]
+        [ShifterName("Title right inactive background color")]
+        [ShifterDescription("What color should be used for the right title corner when the window is inactive?")]
+        public Color TitleInactiveRightCornerBackground = DefaultBackground;
+
+
+        [ShifterMeta("Windows")]
+        [ShifterCategory("Titlebar")]
         [RequiresUpgrade("shift_titlebar")]
         [ShifterFlag("ShowTitleCorners", true)]
         [ShifterName("Title left corner width")]
@@ -1183,6 +1266,16 @@ namespace ShiftOS.Engine
 
         [ShifterMeta("Windows")]
         [ShifterCategory("Titlebar")]
+        [RequiresUpgrade("skinning;shift_titlebar;shift_states")]
+        [ShifterFlag("ShowTitleCorners", true)]
+        [ShifterName("Title left corner inactive background image")]
+        [ShifterDescription("Select an image to appear as the background texture for the left titlebar corner when the window is inactive.")]
+        [Image("titleleftinactive")]
+        public byte[] TitleLeftInactiveBG = null;
+
+
+        [ShifterMeta("Windows")]
+        [ShifterCategory("Titlebar")]
         [RequiresUpgrade("skinning;shift_titlebar")]
         [ShifterFlag("ShowTitleCorners", true)]
         [ShifterName("Title right corner background image")]
@@ -1190,6 +1283,15 @@ namespace ShiftOS.Engine
         [Image("titleright")]
         public byte[] TitleRightBG = null;
 
+        [ShifterMeta("Windows")]
+        [ShifterCategory("Titlebar")]
+        [RequiresUpgrade("skinning;shift_titlebar;shift_states")]
+        [ShifterFlag("ShowTitleCorners", true)]
+        [ShifterName("Title right corner inactive background image")]
+        [ShifterDescription("Select an image to appear as the background texture for the right titlebar corner when the window is inactive.")]
+        [Image("titlerightinactive")]
+        public byte[] TitleRightInactiveBG = null;
+
 
         [ShifterMeta("System")]
         [ShifterCategory("General")]
@@ -1207,6 +1309,15 @@ namespace ShiftOS.Engine
 
         [ShifterMeta("Windows")]
         [ShifterCategory("Window border")]
+        [RequiresUpgrade("skinning;shift_window_borders;shift_states")]
+        [Image("bottomborderinactive")]
+        [ShifterName("Bottom Border Inactive Image")]
+        [ShifterDescription("Select an image to appear on the bottom border when the window is inactive. ")]
+        public byte[] BottomBorderInactiveBG = null;
+
+
+        [ShifterMeta("Windows")]
+        [ShifterCategory("Window border")]
         [RequiresUpgrade("skinning;shift_window_borders")]
         [Image("bottomrborder")]
         [ShifterName("Bottom Right Border Image")]
@@ -1221,6 +1332,25 @@ namespace ShiftOS.Engine
         [ShifterDescription("Select an image to appear on the bottom left border.")]
         public byte[] BottomLBorderBG = null;
 
+
+        [ShifterMeta("Windows")]
+        [ShifterCategory("Window border")]
+        [RequiresUpgrade("skinning;shift_window_borders;shift_states")]
+        [Image("bottomrborderinactive")]
+        [ShifterName("Bottom Right Border Inactive Image")]
+        [ShifterDescription("Select an image to appear on the bottom right border when the window is inactive.")]
+        public byte[] BottomRBorderInactiveBG = null;
+
+        [ShifterMeta("Windows")]
+        [ShifterCategory("Window border")]
+        [RequiresUpgrade("skinning;shift_window_borders;shift_states")]
+        [Image("bottomlborderinactive")]
+        [ShifterName("Bottom Left Border Inactive Image")]
+        [ShifterDescription("Select an image to appear on the bottom left border when the window is inactive.")]
+        public byte[] BottomLBorderInactiveBG = null;
+
+
+
         [ShifterMeta("Windows")]
         [ShifterCategory("Window border")]
         [RequiresUpgrade("skinning;shift_window_borders")]
@@ -1237,6 +1367,25 @@ namespace ShiftOS.Engine
         [ShifterDescription("Select an image to appear on the right border.")]
         public byte[] RightBorderBG = null;
 
+
+        [ShifterMeta("Windows")]
+        [ShifterCategory("Window border")]
+        [RequiresUpgrade("skinning;shift_window_borders;shift_states")]
+        [Image("leftborderinactive")]
+        [ShifterName("Left Border Inactive Image")]
+        [ShifterDescription("Select an image to appear on the left border when the window is inactive.")]
+        public byte[] LeftBorderInactiveBG = null;
+
+        [ShifterMeta("Windows")]
+        [ShifterCategory("Window border")]
+        [RequiresUpgrade("skinning;shift_window_borders;shift_states")]
+        [Image("rightborderinactive")]
+        [ShifterName("Right Border Inactive Image")]
+        [ShifterDescription("Select an image to appear on the right border when the window is inactive.")]
+        public byte[] RightBorderInactiveBG = null;
+
+
+
         [ShifterMeta("Windows")]
         [ShifterCategory("Window border")]
         [RequiresUpgrade("shift_window_borders")]