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

improve overflow menu on properties panel

Browse source 
default to outline mode

issue: MatterHackers/MCCentral#4136
Consider if Modify menu in Overflow menu improves usage
This commit is contained in:
Lars Brubaker 2018-09-14 15:20:19 -07:00
parent bed9bed52b
commit 4e0962a4e7
5 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

33
MatterControlLib/ApplicationView/ApplicationController.cs
View file

@ -137,7 +137,7 @@ namespace MatterHackers.MatterControl
private static PrinterConfig emptyPrinter = new PrinterConfig(PrinterSettings.Empty);
public PopupMenu GetActionMenuForSceneItem(IObject3D selectedItem, InteractiveScene scene)
public PopupMenu GetActionMenuForSceneItem(IObject3D selectedItem, InteractiveScene scene, bool addInSubmenu)
{
var popupMenu = new PopupMenu(ApplicationController.Instance.MenuTheme);
@ -162,12 +162,12 @@ namespace MatterHackers.MatterControl
popupMenu.CreateHorizontalLine();
if (true) //allowOperations)
var selectedItemType = selectedItem.GetType();
var menuTheme = ApplicationController.Instance.MenuTheme;
if (addInSubmenu)
{
var selectedItemType = selectedItem.GetType();
var menuTheme = ApplicationController.Instance.MenuTheme;
popupMenu.CreateSubMenu("Modify".Localize(), ApplicationController.Instance.MenuTheme, (modifyMenu) =>
{
foreach (var nodeOperation in ApplicationController.Instance.Graph.Operations)
@ -187,7 +187,26 @@ namespace MatterHackers.MatterControl
}
}
});
};
}
else
{
foreach (var nodeOperation in ApplicationController.Instance.Graph.Operations)
{
foreach (var type in nodeOperation.MappedTypes)
{
if (type.IsAssignableFrom(selectedItemType)
&& (nodeOperation.IsVisible?.Invoke(selectedItem) != false)
&& nodeOperation.IsEnabled?.Invoke(selectedItem) != false)
{
menuItem = popupMenu.CreateMenuItem(nodeOperation.Title, nodeOperation.IconCollector?.Invoke(menuTheme));
menuItem.Click += (s2, e2) =>
{
nodeOperation.Operation(selectedItem, scene).ConfigureAwait(false);
};
}
}
}
}
return popupMenu;
}