From c4c7ee941f2964860a2f93ad159a556dcb713e1a Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Fri, 3 Oct 2025 14:46:43 +0200
Subject: [PATCH] add industry standard shortcut for editor settings

---
 Source/Editor/Modules/UIModule.cs     | 2 +-
 Source/Editor/Options/InputOptions.cs | 4 ++++
 Source/Editor/Windows/EditorWindow.cs | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Source/Editor/Modules/UIModule.cs b/Source/Editor/Modules/UIModule.cs
index fe89026c5..0e482441e 100644
--- a/Source/Editor/Modules/UIModule.cs
+++ b/Source/Editor/Modules/UIModule.cs
@@ -669,7 +669,7 @@ namespace FlaxEditor.Modules
                 if (item != null)
                     Editor.ContentEditing.Open(item);
             });
-            cm.AddButton("Editor Options", () => Editor.Windows.EditorOptionsWin.Show());
+            cm.AddButton("Editor Options", inputOptions.EditorOptionsWindow, () => Editor.Windows.EditorOptionsWin.Show());
 
             // Scene
             MenuScene = MainMenu.AddButton("Scene");
diff --git a/Source/Editor/Options/InputOptions.cs b/Source/Editor/Options/InputOptions.cs
index af919c1f3..ab473ebed 100644
--- a/Source/Editor/Options/InputOptions.cs
+++ b/Source/Editor/Options/InputOptions.cs
@@ -650,6 +650,10 @@ namespace FlaxEditor.Options
         [EditorDisplay("Windows"), EditorOrder(4020)]
         public InputBinding VisualScriptDebuggerWindow = new InputBinding(KeyboardKeys.None);
 
+        [DefaultValue(typeof(InputBinding), "Control+Comma")]
+        [EditorDisplay("Windows"), EditorOrder(4030)]
+        public InputBinding EditorOptionsWindow = new InputBinding(KeyboardKeys.Comma, KeyboardKeys.Control);
+
         #endregion
 
         #region Node Editors
diff --git a/Source/Editor/Windows/EditorWindow.cs b/Source/Editor/Windows/EditorWindow.cs
index 6d01432ba..03d435efe 100644
--- a/Source/Editor/Windows/EditorWindow.cs
+++ b/Source/Editor/Windows/EditorWindow.cs
@@ -116,6 +116,11 @@ namespace FlaxEditor.Windows
                 if (InputOptions.WindowShortcutsAvaliable)
                     Editor.Windows.VisualScriptDebuggerWin.FocusOrShow();
             });
+            InputActions.Add(options => options.EditorOptionsWindow, () =>
+            {
+                if (InputOptions.WindowShortcutsAvaliable)
+                    Editor.Windows.EditorOptionsWin.FocusOrShow();
+            });
 
             // Register
             Editor.Windows.OnWindowAdd(this);