ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Client.EmuHawk/MainForm.Designer.cs generated
View File

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

10
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

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

15
BizHawk.Client.EmuHawk/tools/InputPrompt.cs
View File

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