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

ordering primitives

Browse source 
refactoring
This commit is contained in:
Lars Brubaker 2020-09-22 17:52:57 -07:00
parent 4da3ace092
commit 06baf2a1b1
17 changed files with 66 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

11
MatterControlLib/PartPreviewWindow/PartTabPage.cs
View file

@ -34,7 +34,6 @@ using MatterHackers.Agg.UI;
using MatterHackers.MatterControl.CustomWidgets;
using MatterHackers.MatterControl.Library;
using MatterHackers.VectorMath;
using ObjParser;
namespace MatterHackers.MatterControl.PartPreviewWindow
{
@ -75,7 +74,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
HAnchor = HAnchor.Left | HAnchor.Stretch,
Visible = true,
};
theme.ApplyBottomBorder(viewControls3D, shadedBorder: (this is PrinterTabPage)); // Shade border if toolbar is secondary rather than primary
// Shade border if toolbar is secondary rather than primary
theme.ApplyBottomBorder(viewControls3D, shadedBorder: this is PrinterTabPage);
viewControls3D.ResetView += (sender, e) =>
{
@ -94,7 +95,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
viewControls3D,
theme,
this,
editorType: (isPrinterType) ? Object3DControlsLayer.EditorType.Printer : Object3DControlsLayer.EditorType.Part);
editorType: isPrinterType ? Object3DControlsLayer.EditorType.Printer : Object3DControlsLayer.EditorType.Part);
viewControls3D.SetView3DWidget(view3DWidget);
@ -149,7 +150,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
HAnchor = HAnchor.Absolute,
VAnchor = VAnchor.Stretch,
AllowContextMenu = false,
ActiveSort = SortKey.ModifiedDate,
Ascending = true,
// restore to state for favorites bar size
Width = expanded ? 55 * GuiWidget.DeviceScale : 33 * GuiWidget.DeviceScale,
ListContentView = new IconView(theme, expanded ? 48 * GuiWidget.DeviceScale : 24 * GuiWidget.DeviceScale)
@ -157,6 +159,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
VAnchor = VAnchor.Fit | VAnchor.Top
},
};
// favoritesBar.ScrollArea.HAnchor = HAnchor.Fit;
favoritesBar.ListContentView.HAnchor = HAnchor.Fit;
leftBar.AddChild(favoritesBar);