From f6351e3fff6dc41a36a29b39ace2fd367134100d Mon Sep 17 00:00:00 2001
From: ChromJ <jcromwell1000@proton.me>
Date: Sat, 24 May 2025 23:47:13 -0500
Subject: [PATCH] Add Ctrl+Comma shortcut for settings

See merge request kenji-nx/ryujinx!2
---
 src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs   | 12 ++++++++++++
 src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml    |  5 +++--
 src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs | 11 -----------
 src/Ryujinx/UI/Windows/MainWindow.axaml            |  1 +
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index 1427ebb28..3ef9b4e62 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -2206,6 +2206,18 @@ namespace Ryujinx.Ava.UI.ViewModels
             IsFullScreen = WindowState == WindowState.FullScreen;
         }
 
+        public async void OpenSettings()
+        {
+            Window.SettingsWindow = new(Window.VirtualFileSystem, Window.ContentManager);
+
+            await Window.SettingsWindow.ShowDialog(Window);
+
+            Window.SettingsWindow = null;
+
+            LoadConfigurableHotKeys();
+
+        }
+
         public static void SaveConfig()
         {
             ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath);
diff --git a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
index ff07da503..676f0ef07 100644
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
@@ -156,10 +156,11 @@
                     Header="{locale:Locale MenuBarShowFileTypes}" />
                 <Separator />
                 <MenuItem
-                    Click="OpenSettings"
                     Padding="-10,0,0,0"
+                    Command="{Binding OpenSettings}"
                     Header="{locale:Locale MenuBarOptionsSettings}"
-                    ToolTip.Tip="{locale:Locale OpenSettingsTooltip}" />
+                    ToolTip.Tip="{locale:Locale OpenSettingsTooltip}"
+                    InputGesture="Ctrl+," />
                 <MenuItem
                     Command="{Binding ManageProfiles}"
                     Padding="-10,0,0,0"
diff --git a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
index 71b20db40..2f33f3d0f 100644
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
@@ -119,17 +119,6 @@ namespace Ryujinx.Ava.UI.Views.Main
             Window.ViewModel.AppHost?.Resume();
         }
 
-        public async void OpenSettings(object sender, RoutedEventArgs e)
-        {
-            Window.SettingsWindow = new(Window.VirtualFileSystem, Window.ContentManager);
-
-            await Window.SettingsWindow.ShowDialog(Window);
-
-            Window.SettingsWindow = null;
-
-            ViewModel.LoadConfigurableHotKeys();
-        }
-
         public async void OpenMiiApplet(object sender, RoutedEventArgs e)
         {
             string contentPath = ViewModel.ContentManager.GetInstalledContentPath(0x0100000000001009, StorageId.BuiltInSystem, NcaContentType.Program);
diff --git a/src/Ryujinx/UI/Windows/MainWindow.axaml b/src/Ryujinx/UI/Windows/MainWindow.axaml
index 6d05f8e14..1f50b1cb3 100644
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml
@@ -41,6 +41,7 @@
         <KeyBinding Gesture="Escape" Command="{Binding ExitCurrentState}" />
         <KeyBinding Gesture="Ctrl+A" Command="{Binding OpenAmiiboWindow}" />
         <KeyBinding Gesture="Ctrl+B" Command="{Binding OpenBinFile}" />
+        <KeyBinding Gesture="Ctrl+," Command="{Binding OpenSettings}" />
     </Window.KeyBindings>
     <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
         <Grid.RowDefinitions>