From d50672d2fc35b5b173f91d6be1407b113b73168b Mon Sep 17 00:00:00 2001 From: John Lewin Date: Wed, 17 Oct 2018 20:34:10 -0700 Subject: [PATCH] Add SectionBackgroundColor for theme control of SectionWidgets --- MatterControlLib/ApplicationView/ThemeConfig.cs | 5 +++-- MatterControlLib/ApplicationView/Themes/AffinityTheme.cs | 2 ++ MatterControlLib/ApplicationView/Themes/SolarizedTheme.cs | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/MatterControlLib/ApplicationView/ThemeConfig.cs b/MatterControlLib/ApplicationView/ThemeConfig.cs index d87bd4a70..de53cf56d 100644 --- a/MatterControlLib/ApplicationView/ThemeConfig.cs +++ b/MatterControlLib/ApplicationView/ThemeConfig.cs @@ -202,6 +202,7 @@ namespace MatterHackers.MatterControl public Color SplashAccentColor { get; set; } public Color BedBackgroundColor { get; set; } public Color PrimaryAccentColor { get; set; } + public Color SectionBackgroundColor { get; set; } public GuiWidget CreateSearchButton() { @@ -481,13 +482,13 @@ namespace MatterHackers.MatterControl { return ApplyBoxStyle( sectionWidget, - this.MinimalShade, + this.SectionBackgroundColor, margin: new BorderDouble(this.DefaultContainerPadding, 0, this.DefaultContainerPadding, this.DefaultContainerPadding)); } public SectionWidget ApplyBoxStyle(SectionWidget sectionWidget, BorderDouble margin) { - return ApplyBoxStyle(sectionWidget, this.MinimalShade, margin); + return ApplyBoxStyle(sectionWidget, this.SectionBackgroundColor, margin); } public SectionWidget ApplyBoxStyle(SectionWidget sectionWidget, Color backgroundColor, BorderDouble margin) diff --git a/MatterControlLib/ApplicationView/Themes/AffinityTheme.cs b/MatterControlLib/ApplicationView/Themes/AffinityTheme.cs index 13e6998e1..dea4a9bd9 100644 --- a/MatterControlLib/ApplicationView/Themes/AffinityTheme.cs +++ b/MatterControlLib/ApplicationView/Themes/AffinityTheme.cs @@ -110,6 +110,8 @@ namespace MatterHackers.MatterControl DropListFieldBorder = new Color("#282828"), RowBorder = new Color("#2c2c2c"), + SectionBackgroundColor = new Color("#404040"), + SlightShade = new Color("#00000028"), MinimalShade = new Color("#0000000F"), Shade = new Color("#00000078"), diff --git a/MatterControlLib/ApplicationView/Themes/SolarizedTheme.cs b/MatterControlLib/ApplicationView/Themes/SolarizedTheme.cs index ace678054..b357685eb 100644 --- a/MatterControlLib/ApplicationView/Themes/SolarizedTheme.cs +++ b/MatterControlLib/ApplicationView/Themes/SolarizedTheme.cs @@ -103,6 +103,9 @@ namespace MatterHackers.MatterControl TextColor = baseColors.Base0 } }, + + SectionBackgroundColor = new Color("#002630"), + SlightShade = new Color("#00000028"), MinimalShade = new Color("#0000000F"), Shade = new Color("#00000078"),