This commit is contained in:
adelikat 2019-12-17 12:01:43 -06:00
parent 5fe25d03ad
commit 6bddec01d6
3 changed files with 5 additions and 21 deletions

View File

@ -542,7 +542,6 @@
this.MainformMenu.Text = "menuStrip1";
this.MainformMenu.MenuActivate += new System.EventHandler(this.MainformMenu_MenuActivate);
this.MainformMenu.MenuDeactivate += new System.EventHandler(this.MainformMenu_MenuDeactivate);
this.MainformMenu.Leave += new System.EventHandler(this.MainformMenu_Leave);
//
// FileSubMenu
//

View File

@ -2930,11 +2930,7 @@ namespace BizHawk.Client.EmuHawk
OpenRomContextMenuItem.Visible = Emulator.IsNull() || _inFullscreen;
bool showMenuVisible = _inFullscreen;
if (!MainMenuStrip.Visible)
{
showMenuVisible = true; // need to always be able to restore this as an emergency measure
}
bool showMenuVisible = _inFullscreen || !MainMenuStrip.Visible; // need to always be able to restore this as an emergency measure
if (_argParser._chromeless)
{
@ -3366,10 +3362,6 @@ namespace BizHawk.Client.EmuHawk
base.OnClosed(e);
}
private void MainformMenu_Leave(object sender, EventArgs e)
{
}
private void MainformMenu_MenuActivate(object sender, EventArgs e)
{
HandlePlatformMenus();

View File

@ -27,11 +27,7 @@ namespace BizHawk.Client.EmuHawk
public string Message
{
get
{
return PromptLabel.Text;
}
get => PromptLabel.Text;
set
{
PromptLabel.Text = value ?? "";
@ -41,14 +37,11 @@ namespace BizHawk.Client.EmuHawk
public string InitialValue
{
get { return PromptBox.Text; }
set { PromptBox.Text = value ?? ""; }
get => PromptBox.Text;
set => PromptBox.Text = value ?? "";
}
public string PromptText
{
get { return PromptBox.Text ?? ""; }
}
public string PromptText => PromptBox.Text ?? "";
private void InputPrompt_Load(object sender, EventArgs e)
{