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

Fix the "Null" window text bug. Part of the problem was scattered logic that sets the text, so I refactored to have a single function that does window text setting logic

This commit is contained in:
adelikat 2014-07-21 20:34:53 +00:00
parent b4e1cc00da
commit 6bad2d9427
2 changed files with 47 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.Client.EmuHawk/MainForm.Movie.cs
View File

@ -117,25 +117,24 @@ namespace BizHawk.Client.EmuHawk
{ {
if (Global.MovieSession.Movie.IsPlaying) if (Global.MovieSession.Movie.IsPlaying)
{ {
Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name + " - " + Path.GetFileName(Global.MovieSession.Movie.Filename);
PlayRecordStatusButton.Image = Properties.Resources.Play; PlayRecordStatusButton.Image = Properties.Resources.Play;
PlayRecordStatusButton.ToolTipText = "Movie is in playback mode"; PlayRecordStatusButton.ToolTipText = "Movie is in playback mode";
PlayRecordStatusButton.Visible = true; PlayRecordStatusButton.Visible = true;
} }
else if (Global.MovieSession.Movie.IsRecording) else if (Global.MovieSession.Movie.IsRecording)
{ {
Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name + " - " + Path.GetFileName(Global.MovieSession.Movie.Filename);
PlayRecordStatusButton.Image = Properties.Resources.RecordHS; PlayRecordStatusButton.Image = Properties.Resources.RecordHS;
PlayRecordStatusButton.ToolTipText = "Movie is in record mode"; PlayRecordStatusButton.ToolTipText = "Movie is in record mode";
PlayRecordStatusButton.Visible = true; PlayRecordStatusButton.Visible = true;
} }
else if (!Global.MovieSession.Movie.IsActive) else if (!Global.MovieSession.Movie.IsActive)
{ {
Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name;
PlayRecordStatusButton.Image = Properties.Resources.Blank; PlayRecordStatusButton.Image = Properties.Resources.Blank;
PlayRecordStatusButton.ToolTipText = "No movie is active"; PlayRecordStatusButton.ToolTipText = "No movie is active";
PlayRecordStatusButton.Visible = false; PlayRecordStatusButton.Visible = false;
} }
SetWindowText();
} }
public void RestartMovie() public void RestartMovie()

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

@ -41,7 +41,7 @@ namespace BizHawk.Client.EmuHawk
private void MainForm_Load(object sender, EventArgs e) private void MainForm_Load(object sender, EventArgs e)
{ {
Text = "BizHawk" + (VersionInfo.DeveloperBuild ? " (interim) " : string.Empty); SetWindowText();
Global.CheatList.Changed += ToolHelpers.UpdateCheatRelatedTools; Global.CheatList.Changed += ToolHelpers.UpdateCheatRelatedTools;
@ -1177,6 +1177,49 @@ namespace BizHawk.Client.EmuHawk
#region Private methods #region Private methods
private static string DisplayNameForSystem(string system)
{
if (system == "NULL")
{
//Text = "BizHawk" + (VersionInfo.DeveloperBuild ? " (interim) " : string.Empty);
//return;
}
var str = Global.SystemInfo.DisplayName;
if (VersionInfo.DeveloperBuild)
{
str += " (interim)";
}
return str;
}
private void SetWindowText()
{
if (Global.Emulator is NullEmulator)
{
Text = "BizHawk" + (VersionInfo.DeveloperBuild ? " (interim) " : string.Empty);
return;
}
var str = Global.SystemInfo.DisplayName;
if (VersionInfo.DeveloperBuild)
{
str += " (interim)";
}
if (Global.MovieSession.Movie.IsActive)
{
Text = str + " - " + Global.Game.Name + " - " + Path.GetFileName(Global.MovieSession.Movie.Filename);
}
else
{
Text = str + " - " + Global.Game.Name;
}
}
private void ClearAutohold() private void ClearAutohold()
{ {
ClearHolds(); ClearHolds();
@ -1451,18 +1494,6 @@ namespace BizHawk.Client.EmuHawk
} }
} }
private static string DisplayNameForSystem(string system)
{
var str = Global.SystemInfo.DisplayName;
if (VersionInfo.DeveloperBuild)
{
str += " (interim)";
}
return str;
}
private static void InitControls() private static void InitControls()
{ {
var controls = new Controller( var controls = new Controller(
@ -3098,7 +3129,7 @@ namespace BizHawk.Client.EmuHawk
Global.Game.Status = nes.RomStatus; Global.Game.Status = nes.RomStatus;
} }
Text = DisplayNameForSystem(loader.Game.System) + " - " + Global.Game.Name; SetWindowText();
Global.Rewinder.ResetRewindBuffer(); Global.Rewinder.ResetRewindBuffer();