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

Add workarounds needed for new toggle switch

Browse source
This commit is contained in:
John Lewin 2018-04-05 16:19:14 -07:00
parent 2d6d6e5c6c
commit 3f9050eae7
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ActionBar/TemperatureWidgetBase.cs
View file

@ -39,7 +39,7 @@ namespace MatterHackers.MatterControl.ActionBar
{
internal abstract class TemperatureWidgetBase : PopupMenuButton
{
protected CheckBox heatToggle;
protected ICheckbox heatToggle;
protected TextWidget CurrentTempIndicator;
private TextWidget goalTempIndicator;
protected TextWidget DirectionIndicator;

6
ActionBar/TemperatureWidgetBed.cs
View file

@ -105,8 +105,10 @@ namespace MatterHackers.MatterControl.ActionBar
},
enforceGutter: false));
//heatToggle = hotendRow.Descendants<CheckBox>().FirstOrDefault();
//heatToggle.Name = "Toggle Heater";
var toggleWidget = hotendRow.Children.Where(o => o is ICheckbox).FirstOrDefault();
toggleWidget.Name = "Toggle Heater";
heatToggle = toggleWidget as ICheckbox;
int tabIndex = 0;
var settingsContext = new SettingsContext(printer, null, NamedSettingsLayers.All);

8
ActionBar/TemperatureWidgetExtruder.cs
View file

@ -241,8 +241,10 @@ namespace MatterHackers.MatterControl.ActionBar
},
enforceGutter: false));
//heatToggle = hotendRow.Descendants<GuiWidget>().OfType<ICheckbox>().FirstOrDefault();
//heatToggle.Name = "Toggle Heater";
var toggleWidget = hotendRow.Children.Where(o => o is ICheckbox).FirstOrDefault();
toggleWidget.Name = "Toggle Heater";
heatToggle = toggleWidget as ICheckbox;
int tabIndex = 0;
var settingsContext = new SettingsContext(printer, null, NamedSettingsLayers.All);
@ -271,7 +273,7 @@ namespace MatterHackers.MatterControl.ActionBar
var valueField = row.Descendants<MHNumberEdit>().FirstOrDefault();
valueField.Name = "Temperature Input";
var settingsRow = row.DescendantsAndSelf<SliceSettingsRow>().FirstOrDefault();
var settingsRow = row.DescendantsAndSelf<SliceSettingsRow>().FirstOrDefault();
ActiveSliceSettings.SettingChanged.RegisterEvent((s, e) =>
{
if (e is StringEventArgs stringEvent)