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

Revise rules for showing operation buttons

Browse source 
- Issue MatterHackers/MCCentral#2852
Wrapping operation buttons should be hidden if not in scene root
This commit is contained in:
John Lewin 2018-03-22 13:18:27 -07:00
parent dd13c5b253
commit 321d24e5cd
1 changed files with 51 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

93
PartPreviewWindow/SelectedObjectPanel.cs
View file

@ -410,54 +410,63 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
editorPanel.AddChild(editorWidget);
var buttons = new List<OperationButton>();
foreach (var graphOperation in ApplicationController.Instance.Graph.Operations)
// Only add Operation buttons if the item is rooted in the scene
if (selectedItem.Parent.Parent == null)
{
foreach (var type in graphOperation.MappedTypes)
{
if (type.IsAssignableFrom(selectedItemType))
{
var button = new OperationButton(graphOperation, selectedItem, theme)
{
BackgroundColor = theme.MinimalShade,
Margin = theme.ButtonSpacing
};
button.EnsureAvailablity();
button.Click += (s, e) =>
{
graphOperation.Operation(selectedItem, scene).ConfigureAwait(false);
};
var buttons = new List<OperationButton>();
buttons.Add(button);
foreach (var graphOperation in ApplicationController.Instance.Graph.Operations)
{
foreach (var type in graphOperation.MappedTypes)
{
if (type.IsAssignableFrom(selectedItemType))
{
var button = new OperationButton(graphOperation, selectedItem, theme)
{
BackgroundColor = theme.MinimalShade,
Margin = theme.ButtonSpacing
};
button.EnsureAvailablity();
button.Click += (s, e) =>
{
graphOperation.Operation(selectedItem, scene).ConfigureAwait(false);
};
buttons.Add(button);
}
}
}
if (buttons.Any())
{
var toolbar = new Toolbar()
{
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit,
Padding = theme.ToolbarPadding,
Margin = new BorderDouble(0, 8)
};
editorPanel.AddChild(toolbar);
foreach (var button in buttons)
{
toolbar.AddChild(button);
}
// TODO: Fix likely leak
selectedItem.Invalidated += (s, e) =>
{
foreach (var button in toolbar.ActionArea.Children.OfType<OperationButton>())
{
button.EnsureAvailablity();
}
};
}
}
if (buttons.Any())
else
{
var toolbar = new Toolbar()
{
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit,
Padding = theme.ToolbarPadding,
Margin = new BorderDouble(0, 8)
};
editorPanel.AddChild(toolbar);
foreach (var button in buttons)
{
toolbar.AddChild(button);
}
// TODO: Fix likely leak
selectedItem.Invalidated += (s, e) =>
{
foreach (var button in toolbar.ActionArea.Children.OfType<OperationButton>())
{
button.EnsureAvailablity();
}
};
// If the button toolbar isn't added, ensure panel has bottom margin
editorWidget.Margin = editorWidget.Margin.Clone(bottom: 15);
}
}
}