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

Json Profiles

Browse source
This commit is contained in:
John Lewin 2016-04-18 11:31:31 -07:00
parent bfa2ddafd8
commit 4496720772
93 changed files with 3069 additions and 4120 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ApplicationView/MenuRow/MenuBase.cs
View file

@ -55,7 +55,7 @@ namespace MatterHackers.MatterControl
this.Margin = new BorderDouble(0);
this.Padding = new BorderDouble(0);
this.VAnchor = Agg.UI.VAnchor.ParentCenter;
this.MenuDropList.SelectionChanged += new EventHandler(MenuDropList_SelectionChanged);
this.MenuDropList.SelectionChanged += MenuDropList_SelectionChanged;
this.MenuDropList.OpenOffset = new Vector2(0, 0);
}
@ -64,9 +64,9 @@ namespace MatterHackers.MatterControl
string menuSelection = ((DropDownMenu)sender).SelectedValue;
foreach (MenuItemAction item in menuItems)
{
if (item.Title == menuSelection)
if (item.Title == menuSelection && item.Action != null)
{
item.Action?.Invoke();
UiThread.RunOnIdle(item.Action);
}
}
}