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

Rearrange MainForm window title

This commit is contained in:
YoshiRulz 2022-01-28 06:00:37 +10:00
parent a401c872f5
commit 55300d7827
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
default.nix
View File

@ -88,7 +88,7 @@ let
${commentUnless useCWDAsSource}dotnet build ${extraDotnetBuildFlags} ${commentUnless useCWDAsSource}dotnet build ${extraDotnetBuildFlags}
${commentUnless useCWDAsSource}cd ../.. ${commentUnless useCWDAsSource}cd ../..
Dist/Build${buildConfig}.sh ${extraDotnetBuildFlags} Dist/Build${buildConfig}.sh ${extraDotnetBuildFlags}
printf "Nix" >output/dll/custombuild.txt printf "NixHawk" >output/dll/custombuild.txt
Dist/Package.sh linux-x64 Dist/Package.sh linux-x64
''; '';
inherit doCheck; inherit doCheck;

26
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -1681,27 +1681,20 @@ namespace BizHawk.Client.EmuHawk
sb.Append($"({_lastFps:0} fps) - "); sb.Append($"({_lastFps:0} fps) - ");
} }
if (!string.IsNullOrEmpty(VersionInfo.CustomBuildString))
{
sb.Append($"{VersionInfo.CustomBuildString} ");
}
sb.Append(Emulator.IsNull() ? "BizHawk" : Emulator.GetSystemDisplayName());
if (VersionInfo.DeveloperBuild)
{
sb.Append(" (interim)");
}
if (!Emulator.IsNull()) if (!Emulator.IsNull())
{ {
sb.Append($" - {Game.Name}"); sb.Append($"{Game.Name} {Emulator.GetSystemDisplayName()} - ");
if (MovieSession.Movie.IsActive()) if (MovieSession.Movie.IsActive())
{ {
sb.Append($" - {Path.GetFileName(MovieSession.Movie.Filename)}"); sb.Append($"{Path.GetFileName(MovieSession.Movie.Filename)} - ");
} }
} }
sb.Append(string.IsNullOrEmpty(VersionInfo.CustomBuildString)
? "BizHawk"
: VersionInfo.CustomBuildString);
if (VersionInfo.DeveloperBuild) sb.Append(" (interim)");
return sb.ToString(); return sb.ToString();
} }
} }
@ -1711,8 +1704,9 @@ namespace BizHawk.Client.EmuHawk
get get
{ {
var sb = new StringBuilder(); var sb = new StringBuilder();
if (!string.IsNullOrEmpty(VersionInfo.CustomBuildString)) sb.Append($"{VersionInfo.CustomBuildString} "); sb.Append(string.IsNullOrEmpty(VersionInfo.CustomBuildString)
sb.Append("BizHawk"); ? "BizHawk"
: VersionInfo.CustomBuildString);
if (VersionInfo.DeveloperBuild) sb.Append(" (interim)"); if (VersionInfo.DeveloperBuild) sb.Append(" (interim)");
return sb.ToString(); return sb.ToString();
} }