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

Merge pull request #114 from mmoening/development

Browse source 
Updated Split Button Implementation
This commit is contained in:
Lars Brubaker 2014-11-28 14:44:44 -08:00
commit ed207a4857
7 changed files with 503 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

31
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -184,7 +184,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
CheckBox expandMaterialOptions;
Button autoArrangeButton;
FlowLayoutWidget saveButtons;
SplitButton saveButtons;
Button applyScaleButton;
PrintItemWrapper printItemWrapper;
@ -1174,8 +1174,33 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
verticalSpacer.VAnchor = VAnchor.ParentBottomTop;
buttonRightPanel.AddChild(verticalSpacer);
saveButtons = CreateSaveButtons();
//Save as dropdown
TupleList<string,Func<bool>> buttonList = new TupleList<string, Func<bool>> ();
buttonList.Add ("Save", () => {
MergeAndSavePartsToCurrentMeshFile();
return true;
});
buttonList.Add ("Save As", () => {
if (saveAsWindow == null)
{
saveAsWindow = new SaveAsWindow(MergeAndSavePartsToNewMeshFile);
saveAsWindow.Closed += (sender2, e2) =>
{
saveAsWindow = null;
};
}
else
{
saveAsWindow.BringToFront();
}
return true;
});
SplitButtonFactory splitButtonFactory = new SplitButtonFactory ();
saveButtons = splitButtonFactory.Generate (buttonList);
saveButtons.Visible = false;
buttonRightPanel.AddChild(saveButtons);
}
buttonRightPanel.Padding = new BorderDouble(6, 6);
@ -1186,6 +1211,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
return buttonRightPanel;
}
private FlowLayoutWidget CreateSaveButtons()
{
FlowLayoutWidget saveButtons = new FlowLayoutWidget();