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-10-17 14:12:09 -07:00
commit 01cf3003f3
24 changed files with 394 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CustomWidgets/PartThumbnailWidget.cs
View file

@ -364,11 +364,11 @@ namespace MatterHackers.MatterControl
bool shiftKeyDown = Keyboard.IsKeyDown(Keys.ShiftKey);
if (shiftKeyDown)
{
OpenPartPreviewWindow (View3DTransformPart.AutoRotate.Disabled);
OpenPartPreviewWindow (View3DWidget.AutoRotate.Disabled);
}
else
{
OpenPartPreviewWindow (View3DTransformPart.AutoRotate.Enabled);
OpenPartPreviewWindow (View3DWidget.AutoRotate.Enabled);
}
}
else
@ -383,7 +383,7 @@ namespace MatterHackers.MatterControl
this.partPreviewWindow = null;
}
private void OpenPartPreviewWindow(View3DTransformPart.AutoRotate autoRotate)
private void OpenPartPreviewWindow(View3DWidget.AutoRotate autoRotate)
{
if (partPreviewWindow == null)
{

7
CustomWidgets/PluginChooserWindow.cs
View file

@ -151,10 +151,6 @@ namespace MatterHackers.MatterControl.CreatorPlugins
pluginRow.Height = 38;
pluginRow.HAnchor = Agg.UI.HAnchor.ParentLeftRight;
GuiWidget overlay = new GuiWidget();
overlay.AnchorAll();
overlay.Cursor = Cursors.Hand;
FlowLayoutWidget macroRow = new FlowLayoutWidget();
macroRow.AnchorAll();
macroRow.BackgroundColor = RGBA_Bytes.White;
@ -207,8 +203,9 @@ namespace MatterHackers.MatterControl.CreatorPlugins
UiThread.RunOnIdle(CloseOnIdle);
};
pluginRow.Cursor = Cursors.Hand;
macroRow.Selectable = false;
pluginRow.AddChild(macroRow);
pluginRow.AddChild(overlay);
pluginListingContainer.AddChild(pluginRow);