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

We had two variables controlling the state of the visibility of the windowed status bar, remove one of them. Fixes issue #448

This commit is contained in:
adelikat 2015-07-12 10:58:13 -04:00
parent 09d134ff79
commit b594360a25
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Client.Common/config/Config.cs
View File

@ -215,7 +215,6 @@ namespace BizHawk.Client.Common
public bool DisplayLagCounter = false; public bool DisplayLagCounter = false;
public bool DisplayInput = false; public bool DisplayInput = false;
public bool DisplayRerecordCount = false; public bool DisplayRerecordCount = false;
public bool DisplayStatusBar = true;
public bool DispBlurry = false; // make display look ugly public bool DispBlurry = false; // make display look ugly
public bool DispFixAspectRatio = true; public bool DispFixAspectRatio = true;

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

@ -667,7 +667,7 @@ namespace BizHawk.Client.EmuHawk
DisplayInputMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Input Display"].Bindings; DisplayInputMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Input Display"].Bindings;
SwitchToFullscreenMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Full Screen"].Bindings; SwitchToFullscreenMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Full Screen"].Bindings;
DisplayStatusBarMenuItem.Checked = Global.Config.DisplayStatusBar; DisplayStatusBarMenuItem.Checked = Global.Config.DispChrome_StatusBarWindowed;
DisplayLogWindowMenuItem.Checked = Global.Config.ShowLogWindow; DisplayLogWindowMenuItem.Checked = Global.Config.ShowLogWindow;
DisplayLagCounterMenuItem.Enabled = Global.Emulator.CanPollInput(); DisplayLagCounterMenuItem.Enabled = Global.Emulator.CanPollInput();
@ -747,7 +747,7 @@ namespace BizHawk.Client.EmuHawk
private void DisplayStatusBarMenuItem_Click(object sender, EventArgs e) private void DisplayStatusBarMenuItem_Click(object sender, EventArgs e)
{ {
Global.Config.DisplayStatusBar ^= true; Global.Config.DispChrome_StatusBarWindowed ^= true;
SetStatusBar(); SetStatusBar();
} }
@ -755,7 +755,7 @@ namespace BizHawk.Client.EmuHawk
{ {
if (!_inFullscreen) if (!_inFullscreen)
{ {
MainStatusBar.Visible = Global.Config.DisplayStatusBar; MainStatusBar.Visible = Global.Config.DispChrome_StatusBarWindowed;
PerformLayout(); PerformLayout();
FrameBufferResized(); FrameBufferResized();
} }

9
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -393,14 +393,7 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Load<Cheats>(); GlobalWin.Tools.Load<Cheats>();
} }
if (Global.Config.DisplayStatusBar == false) SetStatusBar();
{
MainStatusBar.Visible = false;
}
else
{
DisplayStatusBarMenuItem.Checked = true;
}
if (Global.Config.StartPaused) if (Global.Config.StartPaused)
{ {