shiftos-archive/ShiftOS_TheReturn
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Opt-in multistate borders

Browse source
This commit is contained in:
Michael 2017-06-20 18:53:28 -04:00
parent 472b658c22
commit 153057c7be
3 changed files with 80 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ShiftOS.WinForms/Applications/Artpad.Designer.cs generated
View file

@ -2058,7 +2058,6 @@ namespace ShiftOS.WinForms.Applications
this.Label4.TabIndex = 11;
this.Label4.Text = "Colors";
this.Label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.Label4.Click += new System.EventHandler(this.Label4_Click);
//
// line6
//

132
ShiftOS.WinForms/WindowBorder.cs
View file

@ -262,6 +262,74 @@ namespace ShiftOS.WinForms
}
}
public void SetDefaultBorders()
{
pnltitle.BackColor = LoadedSkin.TitleBackgroundColor;
pnltitle.BackgroundImage = GetImage("titlebar");
pnltitleleft.BackColor = LoadedSkin.TitleLeftCornerBackground;
pnltitleright.BackColor = LoadedSkin.TitleRightCornerBackground;
pnltitleleft.BackgroundImage = GetImage("titleleft");
pnltitleleft.BackgroundImageLayout = GetImageLayout("titleleft");
pnltitleright.BackgroundImage = GetImage("titleright");
pnltitleright.BackgroundImageLayout = GetImageLayout("titleright");
pnltitle.BackgroundImageLayout = GetImageLayout("titlebar"); //RETARD ALERT. WHY WASN'T THIS THERE WHEN IMAGELAYOUTS WERE FIRST IMPLEMENTED?
pnlleft.BackColor = LoadedSkin.BorderLeftBackground;
pnlleft.BackgroundImage = GetImage("leftborder");
pnlleft.BackgroundImageLayout = GetImageLayout("leftborder");
pnlright.BackColor = LoadedSkin.BorderRightBackground;
pnlright.BackgroundImage = GetImage("rightborder");
pnlright.BackgroundImageLayout = GetImageLayout("rightborder");
pnlbottom.BackColor = LoadedSkin.BorderBottomBackground;
pnlbottom.BackgroundImage = GetImage("bottomborder");
pnlbottom.BackgroundImageLayout = GetImageLayout("bottomborder");
pnlbottomr.BackColor = LoadedSkin.BorderBottomRightBackground;
pnlbottomr.BackgroundImage = GetImage("bottomrborder");
pnlbottomr.BackgroundImageLayout = GetImageLayout("bottomrborder");
pnlbottoml.BackColor = LoadedSkin.BorderBottomLeftBackground;
pnlbottoml.BackgroundImage = GetImage("bottomlborder");
pnlbottoml.BackgroundImageLayout = GetImageLayout("bottomlborder");
}
public void SetInactiveBorders()
{
pnltitle.BackColor = LoadedSkin.TitleInactiveBackgroundColor;
pnltitle.BackgroundImage = GetImage("titlebarinactive");
pnltitleleft.BackColor = LoadedSkin.TitleInactiveLeftCornerBackground;
pnltitleright.BackColor = LoadedSkin.TitleInactiveRightCornerBackground;
pnltitleleft.BackgroundImage = GetImage("titleleftinactive");
pnltitleleft.BackgroundImageLayout = GetImageLayout("titleleftinactive");
pnltitleright.BackgroundImage = GetImage("titlerightinactive");
pnltitleright.BackgroundImageLayout = GetImageLayout("titlerightinactive");
pnltitle.BackgroundImageLayout = GetImageLayout("titlebarinactive"); //RETARD ALERT. WHY WASN'T THIS THERE WHEN IMAGELAYOUTS WERE FIRST IMPLEMENTED?
pnlleft.BackColor = LoadedSkin.BorderInactiveLeftBackground;
pnlleft.BackgroundImage = GetImage("leftborderinactive");
pnlleft.BackgroundImageLayout = GetImageLayout("leftborderinactive");
pnlright.BackColor = LoadedSkin.BorderInactiveRightBackground;
pnlright.BackgroundImage = GetImage("rightborderinactive");
pnlright.BackgroundImageLayout = GetImageLayout("rightborderinactive");
pnlbottom.BackColor = LoadedSkin.BorderInactiveBottomBackground;
pnlbottom.BackgroundImage = GetImage("bottomborderinactive");
pnlbottom.BackgroundImageLayout = GetImageLayout("bottomborderinactive");
pnlbottomr.BackColor = LoadedSkin.BorderInactiveBottomRightBackground;
pnlbottomr.BackgroundImage = GetImage("bottomrborderinactive");
pnlbottomr.BackgroundImageLayout = GetImageLayout("bottomrborderinactive");
pnlbottoml.BackColor = LoadedSkin.BorderInactiveBottomLeftBackground;
pnlbottoml.BackgroundImage = GetImage("bottomlborderinactive");
pnlbottoml.BackgroundImageLayout = GetImageLayout("bottomlborderinactive");
}
/// <summary>
/// Setups the skin.
/// </summary>
@ -271,68 +339,14 @@ namespace ShiftOS.WinForms
//Border colors and images...
if (IsFocused)
{
pnltitle.BackColor = LoadedSkin.TitleBackgroundColor;
pnltitle.BackgroundImage = GetImage("titlebar");
pnltitleleft.BackColor = LoadedSkin.TitleLeftCornerBackground;
pnltitleright.BackColor = LoadedSkin.TitleRightCornerBackground;
pnltitleleft.BackgroundImage = GetImage("titleleft");
pnltitleleft.BackgroundImageLayout = GetImageLayout("titleleft");
pnltitleright.BackgroundImage = GetImage("titleright");
pnltitleright.BackgroundImageLayout = GetImageLayout("titleright");
pnltitle.BackgroundImageLayout = GetImageLayout("titlebar"); //RETARD ALERT. WHY WASN'T THIS THERE WHEN IMAGELAYOUTS WERE FIRST IMPLEMENTED?
pnlleft.BackColor = LoadedSkin.BorderLeftBackground;
pnlleft.BackgroundImage = GetImage("leftborder");
pnlleft.BackgroundImageLayout = GetImageLayout("leftborder");
pnlright.BackColor = LoadedSkin.BorderRightBackground;
pnlright.BackgroundImage = GetImage("rightborder");
pnlright.BackgroundImageLayout = GetImageLayout("rightborder");
pnlbottom.BackColor = LoadedSkin.BorderBottomBackground;
pnlbottom.BackgroundImage = GetImage("bottomborder");
pnlbottom.BackgroundImageLayout = GetImageLayout("bottomborder");
pnlbottomr.BackColor = LoadedSkin.BorderBottomRightBackground;
pnlbottomr.BackgroundImage = GetImage("bottomrborder");
pnlbottomr.BackgroundImageLayout = GetImageLayout("bottomrborder");
pnlbottoml.BackColor = LoadedSkin.BorderBottomLeftBackground;
pnlbottoml.BackgroundImage = GetImage("bottomlborder");
pnlbottoml.BackgroundImageLayout = GetImageLayout("bottomlborder");
SetDefaultBorders();
}
else
{
pnltitle.BackColor = LoadedSkin.TitleInactiveBackgroundColor;
pnltitle.BackgroundImage = GetImage("titlebarinactive");
pnltitleleft.BackColor = LoadedSkin.TitleInactiveLeftCornerBackground;
pnltitleright.BackColor = LoadedSkin.TitleInactiveRightCornerBackground;
pnltitleleft.BackgroundImage = GetImage("titleleftinactive");
pnltitleleft.BackgroundImageLayout = GetImageLayout("titleleftinactive");
pnltitleright.BackgroundImage = GetImage("titlerightinactive");
pnltitleright.BackgroundImageLayout = GetImageLayout("titlerightinactive");
pnltitle.BackgroundImageLayout = GetImageLayout("titlebarinactive"); //RETARD ALERT. WHY WASN'T THIS THERE WHEN IMAGELAYOUTS WERE FIRST IMPLEMENTED?
pnlleft.BackColor = LoadedSkin.BorderInactiveLeftBackground;
pnlleft.BackgroundImage = GetImage("leftborderinactive");
pnlleft.BackgroundImageLayout = GetImageLayout("leftborderinactive");
pnlright.BackColor = LoadedSkin.BorderInactiveRightBackground;
pnlright.BackgroundImage = GetImage("rightborderinactive");
pnlright.BackgroundImageLayout = GetImageLayout("rightborderinactive");
pnlbottom.BackColor = LoadedSkin.BorderInactiveBottomBackground;
pnlbottom.BackgroundImage = GetImage("bottomborderinactive");
pnlbottom.BackgroundImageLayout = GetImageLayout("bottomborderinactive");
pnlbottomr.BackColor = LoadedSkin.BorderInactiveBottomRightBackground;
pnlbottomr.BackgroundImage = GetImage("bottomrborderinactive");
pnlbottomr.BackgroundImageLayout = GetImageLayout("bottomrborderinactive");
pnlbottoml.BackColor = LoadedSkin.BorderInactiveBottomLeftBackground;
pnlbottoml.BackgroundImage = GetImage("bottomlborderinactive");
pnlbottoml.BackgroundImageLayout = GetImageLayout("bottomlborderinactive");
if (LoadedSkin.RenderInactiveBorders)
SetInactiveBorders();
else
SetDefaultBorders();
}

7
ShiftOS_TheReturn/Skinning.cs
View file

@ -634,6 +634,13 @@ namespace ShiftOS.Engine
[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")]