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

Merge pull request #2857 from larsbrubaker/design_tools

Browse source 
Make themes default to have more contrast when required
This commit is contained in:
Lars Brubaker 2018-01-08 17:02:38 -08:00 • committed by GitHub
commit e00d5c1437
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CustomWidgets/ThemeColorSelectorWidget.cs
View file

@ -75,13 +75,13 @@ namespace MatterHackers.MatterControl
public Button CreateThemeButton(IThemeColors darkTheme, int darkThemeIndex)
{
var normal = new GuiWidget(colorSelectSize, colorSelectSize);
normal.BackgroundColor = darkTheme.PrimaryAccentColor;
normal.BackgroundColor = darkTheme.SourceColor;
var hover = new GuiWidget(colorSelectSize, colorSelectSize);
hover.BackgroundColor = darkTheme.SecondaryAccentColor;
hover.BackgroundColor = darkTheme.SourceColor;
var pressed = new GuiWidget(colorSelectSize, colorSelectSize);
pressed.BackgroundColor = darkTheme.SecondaryAccentColor;
pressed.BackgroundColor = darkTheme.SourceColor;
var disabled = new GuiWidget(colorSelectSize, colorSelectSize);

1
Library/Widgets/ListView/ListView.cs
View file

@ -88,7 +88,6 @@ namespace MatterHackers.MatterControl.CustomWidgets
public ILibraryContainer ActiveContainer => this.LibraryContext.ActiveContainer;
public Color ThumbnailBackground { get; } = ActiveTheme.Instance.TertiaryBackgroundColor.AdjustLightness(1.05).ToColor();
public Color ThumbnailForeground { get; set; } = ActiveTheme.Instance.PrimaryAccentColor;
private async void ActiveContainer_Changed(object sender, ContainerChangedEventArgs e)
{

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 5ac31a91bf082a4e699390235116ee410ee0a742
Subproject commit bad43f38ef713d6b5b953cc674bfd600edfe5082