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

Merge pull request #1959 from larsbrubaker/1.7

Browse source 
Make the reset button fit in t7
This commit is contained in:
johnlewin 2017-02-27 12:57:22 -08:00 • committed by GitHub
commit 66dcac015d
2 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

33
CustomWidgets/PrintingWindow.cs
View file

@ -191,6 +191,12 @@ namespace MatterHackers.MatterControl.CustomWidgets
public PrintingWindow()
: base(1280, 750)
{
}
public override void OnLoad(EventArgs args)
{
bool smallScreen = Parent.Width <= 1180;
AlwaysOnTopOfMain = true;
this.BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor;
this.Title = "Print Monitor".Localize();
@ -202,7 +208,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
};
this.AddChild(topToBottom);
topToBottom.AddChild(CreateActionBar());
topToBottom.AddChild(CreateActionBar(smallScreen));
topToBottom.AddChild(CreateHorizontalLine());
@ -216,9 +222,11 @@ namespace MatterHackers.MatterControl.CustomWidgets
};
bodyContainer.AddChild(basicBody);
topToBottom.AddChild(bodyContainer);
base.OnLoad(args);
}
private GuiWidget CreateActionBar()
private GuiWidget CreateActionBar(bool smallScreen)
{
var actionBar = new FlowLayoutWidget(FlowDirection.LeftToRight)
{
@ -237,7 +245,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
actionBar.AddChild(new HorizontalSpacer());
// put in the pause button
var pauseButton = CreateButton("Pause".Localize().ToUpper());
var pauseButton = CreateButton("Pause".Localize().ToUpper(), smallScreen);
pauseButton.Click += (s, e) =>
{
UiThread.RunOnIdle(() =>
@ -251,7 +259,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
actionBar.AddChild(pauseButton);
// put in the resume button
var resumeButton = CreateButton("Resume".Localize().ToUpper());
var resumeButton = CreateButton("Resume".Localize().ToUpper(), smallScreen);
resumeButton.Visible = false;
resumeButton.Click += (s, e) =>
{
@ -268,7 +276,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
actionBar.AddChild(CreateVerticalLine());
// put in cancel button
var cancelButton = CreateButton("Cancel".Localize().ToUpper());
var cancelButton = CreateButton("Cancel".Localize().ToUpper(), smallScreen);
cancelButton.Click += (s, e) =>
{
bool canceled = ApplicationController.Instance.ConditionalCancelPrint();
@ -283,7 +291,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
actionBar.AddChild(CreateVerticalLine());
// put in the reset button
var resetButton = CreateButton("Reset".Localize().ToUpper(), true, StaticData.Instance.LoadIcon("e_stop4.png", 32, 32));
var resetButton = CreateButton("Reset".Localize().ToUpper(), smallScreen, true, StaticData.Instance.LoadIcon("e_stop4.png", 32, 32));
resetButton.Visible = ActiveSliceSettings.Instance.GetValue<bool>(SettingsKey.show_reset_connection);
resetButton.Click += (s, e) =>
@ -294,7 +302,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
actionBar.AddChild(CreateVerticalLine());
var advancedButton = CreateButton("Advanced".Localize().ToUpper());
var advancedButton = CreateButton("Advanced".Localize().ToUpper(), smallScreen);
actionBar.AddChild(advancedButton);
advancedButton.Click += (s, e) =>
{
@ -390,7 +398,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
base.OnClosed(e);
}
private Button CreateButton(string localizedText, bool centerText = true, ImageBuffer icon = null)
private Button CreateButton(string localizedText, bool smallScreen, bool centerText = true, ImageBuffer icon = null)
{
Button button = null;
if(icon == null)
@ -402,7 +410,14 @@ namespace MatterHackers.MatterControl.CustomWidgets
button = buttonFactory.GenerateTooltipButton(localizedText, icon);
}
var bounds = button.LocalBounds;
bounds.Inflate(new BorderDouble(40, 10));
if (smallScreen)
{
bounds.Inflate(new BorderDouble(10, 10));
}
else
{
bounds.Inflate(new BorderDouble(40, 10));
}
button.LocalBounds = bounds;
button.Cursor = Cursors.Hand;
button.Margin = new BorderDouble(0);

6
SlicerConfiguration/Settings/PrinterSettings.cs
View file

@ -700,14 +700,16 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
return (T)(object)(GetValue<double>(SettingsKey.layer_height) * ratio);
}
else if (settingsKey == SettingsKey.first_layer_extrusion_width)
else if (settingsKey == SettingsKey.first_layer_extrusion_width
|| settingsKey == SettingsKey.external_perimeter_extrusion_width)
{
return (T)(object)(GetValue<double>(SettingsKey.nozzle_diameter) * ratio);
}
return (T)(object)(ratio);
}
else if (settingsKey == SettingsKey.first_layer_extrusion_width)
else if (settingsKey == SettingsKey.first_layer_extrusion_width
|| settingsKey == SettingsKey.external_perimeter_extrusion_width)
{
double extrusionResult;
double.TryParse(this.GetValue(settingsKey), out extrusionResult);