From f228b01bdf8e3738b0843b86a1f35ba272745714 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sun, 7 Aug 2022 17:26:22 +1000 Subject: [PATCH] Rename `IMainFormForTools.SetWindowText` to `UpdateWindowTitle` in practice there is only one implementation and it just called the other method (which is inherited from `FormBase`) --- .../IMainFormForTools.cs | 6 +++--- src/BizHawk.Client.EmuHawk/MainForm.Movie.cs | 2 +- src/BizHawk.Client.EmuHawk/MainForm.cs | 18 +++++------------- .../tools/TAStudio/TAStudio.cs | 2 +- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/IMainFormForTools.cs b/src/BizHawk.Client.EmuHawk/IMainFormForTools.cs index 3a6ee50dfd..d2e6bbdca6 100644 --- a/src/BizHawk.Client.EmuHawk/IMainFormForTools.cs +++ b/src/BizHawk.Client.EmuHawk/IMainFormForTools.cs @@ -89,9 +89,6 @@ namespace BizHawk.Client.EmuHawk void SetMainformMovieInfo(); - /// only referenced from - void SetWindowText(); - bool StartNewMovie(IMovie movie, bool record); /// only referenced from @@ -113,5 +110,8 @@ namespace BizHawk.Client.EmuHawk /// only referenced from void UpdateStatusSlots(); + + /// only referenced from + void UpdateWindowTitle(); } } diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/src/BizHawk.Client.EmuHawk/MainForm.Movie.cs index 7145d7483c..2207c23eaa 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Movie.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Movie.cs @@ -73,7 +73,7 @@ namespace BizHawk.Client.EmuHawk PlayRecordStatusButton.Visible = false; } - SetWindowText(); + UpdateWindowTitle(); UpdateStatusSlots(); } diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index 467c828f78..ab475a397f 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -50,7 +50,7 @@ namespace BizHawk.Client.EmuHawk { private void MainForm_Load(object sender, EventArgs e) { - SetWindowText(); + UpdateWindowTitle(); foreach (var (groupLabel, appliesTo, coreNames) in Config.CorePickerUIData.Select(static tuple => (GroupLabel: tuple.AppliesTo[0], tuple.AppliesTo, tuple.CoreNames)) .OrderBy(static tuple => tuple.GroupLabel)) @@ -461,15 +461,12 @@ namespace BizHawk.Client.EmuHawk Sound?.StopSound(); }; - Resize += (o, e) => - { - SetWindowText(); - }; + Resize += (_, _) => UpdateWindowTitle(); ResizeEnd += (o, e) => { _inResizeLoop = false; - SetWindowText(); + UpdateWindowTitle(); if (_presentationPanel != null) { @@ -1758,8 +1755,6 @@ namespace BizHawk.Client.EmuHawk } } - public void SetWindowText() => UpdateWindowTitle(); - private void ClearAutohold() { ClearHolds(); @@ -3284,10 +3279,7 @@ namespace BizHawk.Client.EmuHawk OSD.Fps = fpsString; // need to refresh window caption in this case - if (Config.DispSpeedupFeatures == 0) - { - SetWindowText(); - } + if (Config.DispSpeedupFeatures is 0) UpdateWindowTitle(); } private void InitializeFpsData() @@ -4018,7 +4010,7 @@ namespace BizHawk.Client.EmuHawk private void OnRomChanged() { OSD.Fps = "0 fps"; - SetWindowText(); + UpdateWindowTitle(); HandlePlatformMenus(); _stateSlots.ClearRedoList(); UpdateStatusSlots(); diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 73bb81f86c..846557f8ab 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -806,7 +806,7 @@ namespace BizHawk.Client.EmuHawk _autosaveTimer.Start(); } - MainForm.SetWindowText(); + MainForm.UpdateWindowTitle(); }); }