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

Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development

Browse source
This commit is contained in:
Kevin Pope 2014-09-05 13:06:20 -07:00
commit f668c132e3
22 changed files with 378 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PrinterControls/EditLevelingSettingsWindow.cs
View file

@ -89,7 +89,7 @@ namespace MatterHackers.MatterControl
BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
int oldHeight = textImageButtonFactory.FixedHeight;
double oldHeight = textImageButtonFactory.FixedHeight;
textImageButtonFactory.FixedHeight = 30;
// put in the movement edit controls

2
PrinterControls/EditManualMovementSpeedsWindow.cs
View file

@ -89,7 +89,7 @@ namespace MatterHackers.MatterControl
this.functionToCallOnSave = functionToCallOnSave;
BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
int oldHeight = textImageButtonFactory.FixedHeight;
double oldHeight = textImageButtonFactory.FixedHeight;
textImageButtonFactory.FixedHeight = 30;
TextWidget tempTypeLabel = new TextWidget(windowTitle, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 10);

2
PrinterControls/EditTemperaturePresetsWindow.cs
View file

@ -91,7 +91,7 @@ namespace MatterHackers.MatterControl
this.functionToCallOnSave = functionToCallOnSave;
BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
int oldHeight = textImageButtonFactory.FixedHeight;
double oldHeight = textImageButtonFactory.FixedHeight;
textImageButtonFactory.FixedHeight = 30;
TextWidget tempTypeLabel = new TextWidget(windowTitle, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 10);