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

10
MatterControlLib/PrinterControls/ControlWidgets/MovementControls.cs
View file

@ -156,7 +156,7 @@ namespace MatterHackers.MatterControl.PrinterControls
// Display the current baby step offset stream values
var offsetStreamLabel = new TextWidget("Z Offset".Localize() + ":", pointSize: 8)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
Margin = new BorderDouble(left: 10),
AutoExpandBoundsToText = true,
VAnchor = VAnchor.Center
@ -191,9 +191,9 @@ namespace MatterHackers.MatterControl.PrinterControls
Padding = 0
};
var xPosition = new TextWidget("X: 0.0 ", pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor);
var yPosition = new TextWidget("Y: 0.0 ", pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor);
var zPosition = new TextWidget("Z: 0.0 ", pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor);
var xPosition = new TextWidget("X: 0.0 ", pointSize: theme.DefaultFontSize, textColor: theme.TextColor);
var yPosition = new TextWidget("Y: 0.0 ", pointSize: theme.DefaultFontSize, textColor: theme.TextColor);
var zPosition = new TextWidget("Z: 0.0 ", pointSize: theme.DefaultFontSize, textColor: theme.TextColor);
hwDestinationBar.AddChild(xPosition);
hwDestinationBar.AddChild(yPosition);
@ -284,7 +284,7 @@ namespace MatterHackers.MatterControl.PrinterControls
zOffsetStreamDisplay = new TextWidget(zoffset.ToString("0.##"), pointSize: theme.DefaultFontSize)
{
AutoExpandBoundsToText = true,
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
Margin = new BorderDouble(5, 0, 8, 0),
VAnchor = VAnchor.Center
};