misc: Use a method to create window titles.

dexsage · Oct 14, 2024 · 5f6d9ee · 5f6d9ee
1 parent 40a4887
commit 5f6d9ee
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/src/Ryujinx/App.axaml.cs b/src/Ryujinx/App.axaml.cs
@@ -19,9 +19,14 @@ namespace Ryujinx.Ava
 {
     public class App : Application
     {
+        internal static string FormatTitle(LocaleKeys? windowTitleKey = null)
+            => windowTitleKey is null 
+                ? $"Ryujinx {Program.Version}" 
+                : $"Ryujinx {Program.Version} - {LocaleManager.Instance[windowTitleKey.Value]}";
+
         public override void Initialize()
         {
-            Name = $"Ryujinx {Program.Version}";
+            Name = FormatTitle();
 
             AvaloniaXamlLoader.Load(this);
 

diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -1705,7 +1705,7 @@ public void AppHost_AppExit(object sender, EventArgs e)
 
             Dispatcher.UIThread.InvokeAsync(() =>
             {
-                Title = $"Ryujinx {Program.Version}";
+                Title = App.FormatTitle();
             });
         }
 

diff --git a/src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs b/src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs
@@ -18,7 +18,7 @@ public AmiiboWindow(bool showAll, string lastScannedAmiiboId, string titleId)
 
             InitializeComponent();
 
-            Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance[LocaleKeys.Amiibo];
+            Title = App.FormatTitle(LocaleKeys.Amiibo);
         }
 
         public AmiiboWindow()
@@ -31,7 +31,7 @@ public AmiiboWindow()
 
             if (Program.PreviewerDetached)
             {
-                Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance[LocaleKeys.Amiibo];
+                Title = App.FormatTitle(LocaleKeys.Amiibo);
             }
         }
 

diff --git a/src/Ryujinx/UI/Windows/CheatWindow.axaml.cs b/src/Ryujinx/UI/Windows/CheatWindow.axaml.cs
@@ -30,7 +30,7 @@ public CheatWindow()
 
             InitializeComponent();
 
-            Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance[LocaleKeys.CheatWindowTitle];
+            Title = App.FormatTitle(LocaleKeys.CheatWindowTitle);
         }
 
         public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath)
@@ -95,7 +95,7 @@ public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string t
 
             DataContext = this;
 
-            Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance[LocaleKeys.CheatWindowTitle];
+            Title = App.FormatTitle(LocaleKeys.CheatWindowTitle);
         }
 
         public void Save()

diff --git a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -79,7 +79,7 @@ public MainWindow()
 
             UiHandler = new AvaHostUIHandler(this);
 
-            ViewModel.Title = $"Ryujinx {Program.Version}";
+            ViewModel.Title = App.FormatTitle();
 
             // NOTE: Height of MenuBar and StatusBar is not usable here, since it would still be 0 at this point.
             StatusBarHeight = StatusBarView.StatusBar.MinHeight;

diff --git a/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs b/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
@@ -14,7 +14,7 @@ public partial class SettingsWindow : StyleableWindow
 
         public SettingsWindow(VirtualFileSystem virtualFileSystem, ContentManager contentManager)
         {
-            Title = $"Ryujinx {Program.Version} - {LocaleManager.Instance[LocaleKeys.Settings]}";
+            Title = App.FormatTitle(LocaleKeys.Settings);
 
             ViewModel = new SettingsViewModel(virtualFileSystem, contentManager);
             DataContext = ViewModel;
-Original file line number
+Diff line change
@@ Expand Up / @@ -1705,7 +1705,7 @@ public void AppHost_AppExit(object sender, EventArgs e) @@
                 Dispatcher.UIThread.InvokeAsync(() =>
                 {
-                    Title = $"Ryujinx {Program.Version}";
+                    Title = App.FormatTitle();
                 });
             }
@@ Expand Down @@