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

Merge pull request #2304 from larsbrubaker/design_tools

Browse source 
Change to solid when button clicked
This commit is contained in:
Lars Brubaker 2017-08-01 15:00:51 -07:00 • committed by GitHub
commit 6e633ae17c
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
PartPreviewWindow/View3D/BaseObject3DEditor.cs
View file

@ -108,7 +108,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
mainContainer.AddChild(behavior3DTypeButtons);
// put in the button for making the behavior solid
var solidBehaviorButton = new PopupButton(theme.textImageButtonFactory.Generate("Solid".Localize()))
Button createdButton;
var solidBehaviorButton = new PopupButton(createdButton = theme.textImageButtonFactory.Generate("Solid".Localize()))
{
Name = "Solid Colors",
AlignToRightEdge = true,
@ -119,7 +120,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
BackgroundColor = RGBA_Bytes.White
}
};
solidBehaviorButton.Click += (s, e) =>
createdButton.Click += (s, e) =>
{
item.OutputType = PrintOutputTypes.Solid;
};

3
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -360,7 +360,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var materialsButton = new PopupButton(smallMarginButtonFactory.Generate("Materials".Localize()))
{
PopDirection = Direction.Up,
PopupContent = this.AddMaterialControls()
PopupContent = this.AddMaterialControls(),
AlignToRightEdge = true
};
doEdittingButtonsContainer.AddChild(materialsButton);
}

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 8527327fcdd703f5eb2836b54ebff8559e625e07
Subproject commit e529414690964af6821a7f74f5b102df280ed580