nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restore color button preview

Browse source
This commit is contained in:
John Lewin 2018-10-20 23:30:43 -07:00
parent 73c11b5d2d
commit b0709cc8c3
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
MatterControlLib/ConfigurationPage/ApplicationSettings/ThemeColorPanel.cs
View file

@ -50,9 +50,10 @@ namespace MatterHackers.MatterControl.ConfigurationPage
private IColorTheme _themeProvider;
private GuiWidget previewButtonPanel;
public ThemeColorPanel(ThemeConfig activeTheme)
public ThemeColorPanel(ThemeConfig activeTheme, AccentColorsWidget colorSelector)
: base (FlowDirection.TopToBottom)
{
this.colorSelector = colorSelector;
string currentProviderName = UserSettings.Instance.get(UserSettingsKey.ThemeName) ?? "";
if (AppContext.ThemeProviders.TryGetValue(currentProviderName, out IColorTheme currentProvider))
@ -201,9 +202,12 @@ namespace MatterHackers.MatterControl.ConfigurationPage
{
lastColor = accentColor;
foreach (var colorButton in colorSelector.ColorButtons)
if (colorSelector != null)
{
colorButton.BorderColor = (colorButton.SourceColor == accentColor) ? Color.White : Color.Transparent;
foreach (var colorButton in colorSelector.ColorButtons)
{
colorButton.BorderColor = (colorButton.SourceColor == accentColor) ? Color.White : Color.Transparent;
}
}
themeSet.Theme.PrimaryAccentColor = accentColor;

14
MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs
View file

@ -283,12 +283,6 @@ namespace MatterHackers.MatterControl
this.AddSettingsRow(section, generalPanel);
themeColorPanel = new ThemeColorPanel(theme)
{
HAnchor = HAnchor.Stretch,
Margin = new BorderDouble(10, 10, 10, 2)
};
var accentButtons = new ThemeColorPanel.AccentColorsWidget(AppContext.ThemeSet, 16)
{
HAnchor = HAnchor.Fit,
@ -296,6 +290,14 @@ namespace MatterHackers.MatterControl
Margin = new BorderDouble(right: theme.DefaultContainerPadding)
};
themeColorPanel = new ThemeColorPanel(theme, accentButtons)
{
HAnchor = HAnchor.Stretch,
Margin = new BorderDouble(10, 10, 10, 2)
};
accentButtons.ThemeColorPanel = themeColorPanel;
var themeSection = new SectionWidget("Theme".Localize(), themeColorPanel, theme, accentButtons, expanded: true, expandingContent: false)
{
Name = "Theme Section",