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

Remove workarounds for menu theme colors, rely on new theme support

Browse source
This commit is contained in:
John Lewin 2018-10-30 13:23:19 -07:00
parent a59419bb32
commit 6659156926
5 changed files with 10 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MatterControlLib/ActionBar/TemperatureWidgetBed.cs
View file

@ -118,7 +118,6 @@ namespace MatterHackers.MatterControl.ActionBar
var settingsData = SettingsOrganizer.Instance.GetSettingsData(SettingsKey.bed_temperature);
var temperatureRow = SliceSettingsTabView.CreateItemRow(settingsData, settingsContext, printer, menuTheme, ref tabIndex, allUiFields);
SliceSettingsRow.AddBordersToEditFields(temperatureRow);
container.AddChild(temperatureRow);
alwaysEnabled.Add(hotendRow);
@ -143,7 +142,6 @@ namespace MatterHackers.MatterControl.ActionBar
}, 1);
this.Closed += (s, e) => runningInterval.Continue = false;
var valueField = temperatureRow.Descendants<MHNumberEdit>().FirstOrDefault();
var settingsRow = temperatureRow.DescendantsAndSelf<SliceSettingsRow>().FirstOrDefault();
PrinterSettings.SettingChanged.RegisterEvent((s, e) =>
{
@ -166,7 +164,7 @@ namespace MatterHackers.MatterControl.ActionBar
var temp = printer.Settings.GetValue<double>(SettingsKey.bed_temperature);
graph.GoalValue = temp;
// TODO: Why is this only when enabled? How does it get set to
// TODO: Why is this only when enabled? How does it get set to
if (heatToggle.Checked)
{
// TODO: Why is a UI widget who is listening to model events driving this behavior? What when it's not loaded?

3
MatterControlLib/ActionBar/TemperatureWidgetExtruder.cs
View file

@ -259,7 +259,6 @@ namespace MatterHackers.MatterControl.ActionBar
var settingsContext = new SettingsContext(printer, null, NamedSettingsLayers.All);
var settingsData = SettingsOrganizer.Instance.GetSettingsData(TemperatureKey);
var temperatureRow = SliceSettingsTabView.CreateItemRow(settingsData, settingsContext, printer, menuTheme, ref tabIndex, allUiFields);
SliceSettingsRow.AddBordersToEditFields(temperatureRow);
container.AddChild(temperatureRow);
// Add the temperature row to the always enabled list ensuring the field can be set when disconnected
@ -309,7 +308,7 @@ namespace MatterHackers.MatterControl.ActionBar
graph.GoalValue = temp;
// TODO: Why is this only when enabled? How does it get set to
// TODO: Why is this only when enabled?
if (heatToggle.Checked)
{
// TODO: Why is a UI widget who is listening to model events driving this behavior? What when it's not loaded?