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

Move theme.Colors.PrimaryTextColor into theme, remove unneeded types

Browse source 
- Issue MatterHackers/MCCentral#4490
This commit is contained in:
John Lewin 2018-11-03 09:13:07 -07:00
parent c279f8a511
commit 8d4974dc32
103 changed files with 245 additions and 426 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MatterControlLib/ControlElements/MHDropDownList.cs
View file

@ -43,9 +43,9 @@ namespace MatterHackers.MatterControl
var menuTheme = AppContext.MenuTheme;
this.MenuItemsBackgroundColor = menuTheme.ActiveTabColor;
this.MenuItemsTextColor = menuTheme.Colors.PrimaryTextColor;
this.MenuItemsTextColor = menuTheme.TextColor;
this.MenuItemsBackgroundHoverColor = menuTheme.AccentMimimalOverlay;
this.MenuItemsTextHoverColor = menuTheme.Colors.PrimaryTextColor;
this.MenuItemsTextHoverColor = menuTheme.TextColor;
this.MenuItemsBorderColor = menuTheme.DropList.Open.BackgroundColor;
this.theme = theme;

3
MatterControlLib/ControlElements/StyledMessageBoxWindow.cs
View file

@ -78,7 +78,7 @@ namespace MatterHackers.MatterControl
responseCallback = callback;
unwrappedMessage = message;
ContentRow.AddChild(messageContainer = new TextWidget(message, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 12 * DeviceScale)
ContentRow.AddChild(messageContainer = new TextWidget(message, textColor: theme.TextColor, pointSize: 12 * DeviceScale)
{
AutoExpandBoundsToText = true,
HAnchor = HAnchor.Left
@ -164,4 +164,3 @@ namespace MatterHackers.MatterControl
}
}