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

Switch from dropdown to horizontal theme list, per theme accent colors

Browse source
This commit is contained in:
John Lewin 2018-10-20 22:36:33 -07:00
parent d0f2862650
commit 1fda1e231d
3 changed files with 23 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

15
MatterControlLib/ConfigurationPage/ApplicationSettings/ThemePreviewButton.cs
View file

@ -27,6 +27,7 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System.Collections.Generic;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.VectorMath;
@ -42,12 +43,14 @@ namespace MatterHackers.MatterControl.ConfigurationPage
private GuiWidget icon1;
private GuiWidget icon2;
private GuiWidget icon3;
private ThemeConfig theme;
private ImageWidget activeIcon;
public ThemePreviewButton(ThemeConfig theme, ThemeColorPanel themeColorPanel)
public ThemePreviewButton(ThemeSet themeSet, ThemeColorPanel themeColorPanel)
{
this.theme = theme;
this.ThemeSet = themeSet;
var theme = this.ThemeSet.Theme;
activeColor = theme.Colors.SourceColor;
var primaryAccentColor = theme.PrimaryAccentColor;
@ -135,15 +138,15 @@ namespace MatterHackers.MatterControl.ConfigurationPage
};
overlay.Click += (s, e) =>
{
UserSettings.Instance.set(UserSettingsKey.ThemeMode, this.Mode);
// Activate the theme
themeColorPanel.SetThemeColor(activeColor, this.Mode);
themeColorPanel.SetThemeColor(this.ThemeSet, activeColor, this.Mode);
};
this.AddChild(overlay);
}
public ThemeSet ThemeSet { get; }
public bool IsActive
{
get => activeIcon.Visible;