GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'xxSeys1-IndustryStandardSettingsShortcut'

Browse Source
This commit is contained in:
Wojtek Figat
2025-10-10 08:31:40 +02:00
parent ef2c551cee 20f576783b
commit 8da0d2c4ce
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/Modules/UIModule.cs
View File

@@ -669,7 +669,7 @@ namespace FlaxEditor.Modules
if (item != null) if (item != null)
Editor.ContentEditing.Open(item); Editor.ContentEditing.Open(item);
}); });
cm.AddButton("Editor Options", () => Editor.Windows.EditorOptionsWin.Show()); cm.AddButton("Editor Options", inputOptions.EditorOptionsWindow, () => Editor.Windows.EditorOptionsWin.Show());
// Scene // Scene
MenuScene = MainMenu.AddButton("Scene"); MenuScene = MainMenu.AddButton("Scene");

4
Source/Editor/Options/InputOptions.cs
View File

@@ -650,6 +650,10 @@ namespace FlaxEditor.Options
[EditorDisplay("Windows"), EditorOrder(4020)] [EditorDisplay("Windows"), EditorOrder(4020)]
public InputBinding VisualScriptDebuggerWindow = new InputBinding(KeyboardKeys.None); 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 #endregion
#region Node Editors #region Node Editors

5
Source/Editor/Windows/EditorWindow.cs
View File

@@ -116,6 +116,11 @@ namespace FlaxEditor.Windows
if (InputOptions.WindowShortcutsAvaliable) if (InputOptions.WindowShortcutsAvaliable)
Editor.Windows.VisualScriptDebuggerWin.FocusOrShow(); Editor.Windows.VisualScriptDebuggerWin.FocusOrShow();
}); });
InputActions.Add(options => options.EditorOptionsWindow, () =>
{
if (InputOptions.WindowShortcutsAvaliable)
Editor.Windows.EditorOptionsWin.FocusOrShow();
});
// Register // Register
Editor.Windows.OnWindowAdd(this); Editor.Windows.OnWindowAdd(this);