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

Convert KeepOpen to property, revise popup close logic

Browse source
This commit is contained in:
John Lewin 2018-10-11 15:04:03 -07:00
parent c0b638e2e7
commit 22c0125b42
12 changed files with 56 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

28
MatterControlLib/PartPreviewWindow/PopupMenu.cs
View file

@ -142,14 +142,17 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
graphics2D.Render(arrow, this.Enabled ? Color.Black : Color.Gray);
}
public bool KeepMenuOpen()
public bool KeepMenuOpen
{
if (SubMenu != null)
get
{
return SubMenu.ContainsFocus;
}
if (SubMenu != null)
{
return SubMenu.ContainsFocus;
}
return false;
return false;
}
}
}
@ -171,10 +174,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
base.OnLoad(args);
}
public bool KeepMenuOpen()
{
return false;
}
public bool KeepMenuOpen => false;
public bool Checked
{
@ -245,10 +245,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
base.OnLoad(args);
}
public bool KeepMenuOpen()
{
return false;
}
public bool KeepMenuOpen => false;
public IList<GuiWidget> SiblingRadioButtonList { get; set; }
@ -421,10 +418,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
return menuItem;
}
public bool KeepMenuOpen()
{
return false;
}
public bool KeepMenuOpen => false;
public class MenuItem : SimpleButton
{