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

Fix icon alignment via button margins

Browse source
This commit is contained in:
John Lewin 2017-07-11 16:12:57 -07:00
parent 77a4725af5
commit 20d988c1aa
3 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

17
PartPreviewWindow/View3D/PrinterActionsBar.cs
View file

@ -80,6 +80,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
UndoBuffer undoBuffer = modelViewer.UndoBuffer;
var defaultMargin = new BorderDouble(8, 0);
sliceProgressReporter = new SliceProgressReporter(modelViewer.meshViewerWidget);
this.HAnchor = HAnchor.ParentLeftRight;
@ -89,7 +91,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.AddChild(new PrinterConnectButton(buttonFactory));
this.AddChild(new PrintActionRow(buttonFactory, this));
this.AddChild(new PrintActionRow(buttonFactory, this, defaultMargin));
this.AddChild(new HorizontalSpacer());
@ -98,7 +100,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var sliceButton = buttonFactory.Generate("Slice".Localize());
sliceButton.ToolTipText = "Slice Parts".Localize();
sliceButton.Name = "Generate Gcode Button";
sliceButton.Margin = new BorderDouble(8, 0);
sliceButton.Margin = defaultMargin;
sliceButton.Click += async (s, e) =>
{
if (ActiveSliceSettings.Instance.PrinterSelected)
@ -155,7 +157,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.AddChild(new TemperatureWidgetBed());
}
buttonFactory.Margin = new BorderDouble(8, 0);
buttonFactory.Margin = defaultMargin;
Button configureEePromButton = buttonFactory.Generate("", StaticData.Instance.LoadIcon("memory_16x16.png", 16, 16));
configureEePromButton.ToolTipText = "EEProm";
@ -166,14 +168,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
undoButton.Name = "3D View Undo";
undoButton.ToolTipText = "Undo";
undoButton.Enabled = false;
undoButton.Margin = new BorderDouble(8, 0);
undoButton.Margin = defaultMargin;
undoButton.Click += (sender, e) =>
{
undoBuffer.Undo();
};
this.AddChild(undoButton);
undoButton.VAnchor = VAnchor.ParentCenter;
undoButton.Margin = 3;
Button redoButton = buttonFactory.Generate("", StaticData.Instance.LoadIcon("Redo_grey_16x.png", 16, 16));
redoButton.Name = "3D View Redo";
@ -185,7 +186,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
};
this.AddChild(redoButton);
redoButton.VAnchor = VAnchor.ParentCenter;
redoButton.Margin = 3;
buttonFactory.Margin = initialMargin;
@ -201,7 +201,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
overflowDropdown = new OverflowDropdown(allowLightnessInvert: true)
{
AlignToRightEdge = true,
Name = "Printer Overflow Menu"
Name = "Printer Overflow Menu",
Margin = defaultMargin
};
overflowDropdown.DynamicPopupContent = GeneratePrinterOverflowMenu;
@ -209,7 +210,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.Closed += (s, e) =>
{
overflowDropdown.DynamicPopupContent = GeneratePrinterOverflowMenu;
};
};
this.AddChild(overflowDropdown);
}