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

Changed RGBA_Bytes -> Color

Browse source
This commit is contained in:
Lars Brubaker 2017-10-31 11:43:25 -07:00
parent c6a3c14118
commit 8d1fecab8c
107 changed files with 495 additions and 495 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs
View file

@ -52,7 +52,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
private TextImageButtonFactory buttonFactory;
private RGBA_Bytes menuTextColor = RGBA_Bytes.Black;
private Color menuTextColor = Color.Black;
public ApplicationSettingsWidget(TextImageButtonFactory buttonFactory)
: base(FlowDirection.TopToBottom)

2
ConfigurationPage/ApplicationSettings/SettingsItem.cs
View file

@ -16,7 +16,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
public Action<bool> ToggleAction { get; set; }
}
private static RGBA_Bytes menuTextColor = RGBA_Bytes.Black;
private static Color menuTextColor = Color.Black;
public SettingsItem(string text, ToggleSwitchConfig toggleSwitchConfig = null, GuiWidget optionalControls = null, ImageBuffer iconImage = null, bool enforceGutter = true)
: this(text, CreateToggleSwitch(toggleSwitchConfig), optionalControls, iconImage, enforceGutter)

8
ConfigurationPage/PrintLeveling/PrintLevelPages.cs
View file

@ -54,8 +54,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
: base(printer, pageDescription, instructionsText)
{
int extruderIndex = 0;
var materialSelector = new PresetSelectorWidget(printer, string.Format($"{"Material".Localize()} {extruderIndex + 1}"), RGBA_Bytes.Transparent, NamedSettingsLayers.Material, extruderIndex);
materialSelector.BackgroundColor = RGBA_Bytes.Transparent;
var materialSelector = new PresetSelectorWidget(printer, string.Format($"{"Material".Localize()} {extruderIndex + 1}"), Color.Transparent, NamedSettingsLayers.Material, extruderIndex);
materialSelector.BackgroundColor = Color.Transparent;
materialSelector.Margin = new BorderDouble(0, 0, 0, 15);
topToBottomControls.AddChild(materialSelector);
}
@ -81,7 +81,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
FillColor = ActiveTheme.Instance.PrimaryAccentColor,
BorderColor = ActiveTheme.Instance.PrimaryTextColor,
BackgroundColor = RGBA_Bytes.White,
BackgroundColor = Color.White,
Margin = new BorderDouble(3, 0, 0, 0),
VAnchor = VAnchor.Center
};
@ -395,7 +395,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
private FlowLayoutWidget CreateZButtons()
{
FlowLayoutWidget zButtons = JogControls.CreateZButtons(printer, RGBA_Bytes.White, 4, out zPlusControl, out zMinusControl, true);
FlowLayoutWidget zButtons = JogControls.CreateZButtons(printer, Color.White, 4, out zPlusControl, out zMinusControl, true);
// set these to 0 so the button does not do any movements by default (we will handle the movement on our click callback)
zPlusControl.MoveAmount = 0;
zMinusControl.MoveAmount = 0;

6
ConfigurationPage/RunningMacroPage.cs
View file

@ -60,8 +60,8 @@ namespace MatterHackers.MatterControl.PrinterControls
if (macroData.showMaterialSelector)
{
int extruderIndex = 0;
var materialSelector = new PresetSelectorWidget(printer, string.Format($"{"Material".Localize()} {extruderIndex + 1}"), RGBA_Bytes.Transparent, NamedSettingsLayers.Material, extruderIndex);
materialSelector.BackgroundColor = RGBA_Bytes.Transparent;
var materialSelector = new PresetSelectorWidget(printer, string.Format($"{"Material".Localize()} {extruderIndex + 1}"), Color.Transparent, NamedSettingsLayers.Material, extruderIndex);
materialSelector.BackgroundColor = Color.Transparent;
materialSelector.Margin = new BorderDouble(0, 0, 0, 15);
contentRow.AddChild(materialSelector);
}
@ -96,7 +96,7 @@ namespace MatterHackers.MatterControl.PrinterControls
{
FillColor = ActiveTheme.Instance.PrimaryAccentColor,
BorderColor = ActiveTheme.Instance.PrimaryTextColor,
BackgroundColor = RGBA_Bytes.White,
BackgroundColor = Color.White,
Margin = new BorderDouble(3, 0, 0, 10),
};
progressBarText = new TextWidget("", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor)