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

Make tests run in single window mode

Browse source 
Cleaning up a theme problem with shared temp

issue: MatterHackers/MCCentral#4677
make tests run in single window mode so they match our release
This commit is contained in:
Lars Brubaker 2018-12-10 14:26:29 -08:00
parent 7bb8763e2f
commit 553d09c353
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MatterControlLib/ActionBar/TemperatureWidgetExtruder.cs
View file

@ -189,10 +189,12 @@ namespace MatterHackers.MatterControl.ActionBar
private string waitingForExtruderToHeatMessage = "The extruder is currently heating and its target temperature cannot be changed until it reaches {0}°C.\n\nYou can set the starting extruder temperature in 'Slice Settings' -> 'Filament'.\n\n{1}".Localize();
private Dictionary<string, UIField> allUiFields = new Dictionary<string, UIField>();
private RunningInterval runningInterval;
private ThemeConfig theme;
public TemperatureWidgetHotend(PrinterConfig printer, int hotendIndex, ThemeConfig theme, int totalHotends)
: base(printer, "150.3°", theme)
{
this.theme = theme;
this.Name = $"Hotend {hotendIndex}";
this.hotendIndex = hotendIndex;
this.DisplayCurrentTemperature();
@ -400,7 +402,7 @@ namespace MatterHackers.MatterControl.ActionBar
container.AddChild(new TextWidget("Extruder".Localize() + " " + (extruderIndex + 1).ToString(), pointSize: menuTheme.DefaultFontSize)
{
AutoExpandBoundsToText = true,
TextColor = Color.Black,
TextColor = theme.TextColor,
HAnchor = HAnchor.Left,
});
container.AddChild(new ControlContentExtruder(printer, extruderIndex, menuTheme)

2
MatterControlLib/CustomWidgets/SingleWindowProvider.cs
View file

@ -67,6 +67,8 @@ namespace MatterHackers.Agg.UI
PlatformWindow = platformWindow
};
_openWindows.FirstOrDefault().Unfocus();
systemWindow.HAnchor = HAnchor.Stretch;
systemWindow.VAnchor = VAnchor.Stretch;