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

Remove EmptyMenu behavior

Browse source
This commit is contained in:
jlewin 2019-06-12 11:56:38 -07:00
parent f884e336a4
commit 02d9a8d93b
4 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControlLib/ApplicationView/ApplicationController.cs
View file

@ -414,7 +414,7 @@ namespace MatterHackers.MatterControl
workspaceActions["Delete"]
};
menuTheme.CreateMenuItems(popupMenu, actions, emptyMenu: false);
menuTheme.CreateMenuItems(popupMenu, actions);
if (selectedItem is ComponentObject3D componentObject)
{

9
MatterControlLib/ApplicationView/Themes/ThemeConfig.cs
View file

@ -368,15 +368,8 @@ namespace MatterHackers.MatterControl
return new BlenderBGRA().Blend(background, overlay);
}
public FlowLayoutWidget CreateMenuItems(PopupMenu popupMenu, IEnumerable<NamedAction> menuActions, bool emptyMenu = true)
public FlowLayoutWidget CreateMenuItems(PopupMenu popupMenu, IEnumerable<NamedAction> menuActions)
{
// Retain past behavior, where menu is cleared each call. More recent callers many pass in a newly populated menu and
// not require the clear
if (emptyMenu)
{
popupMenu.CloseAllChildren();
}
// Create menu items in the DropList for each element in this.menuActions
foreach (var menuAction in menuActions)
{

2
MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -1593,7 +1593,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
workspaceActions["ClearBed"],
};
theme.CreateMenuItems(popupMenu, actions, emptyMenu: false);
theme.CreateMenuItems(popupMenu, actions);
var popupBounds = new RectangleDouble(position.X + 1, position.Y + 1, position.X + 1, position.Y + 1);

2
MatterControlLib/PartPreviewWindow/ViewControls3D.cs
View file

@ -292,7 +292,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
};
menuTheme.CreateMenuItems(popupMenu, actions, emptyMenu: false);
menuTheme.CreateMenuItems(popupMenu, actions);
return popupMenu;
};