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

Improve #970 by using OptionsChanged event

Browse Source
This commit is contained in:
Wojtek Figat
2023-04-04 17:40:05 +02:00
parent ce45c92dae
commit 6c8b5e5e8a
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -356,6 +356,8 @@ namespace FlaxEditor.Modules
InitStatusBar(mainWindow); InitStatusBar(mainWindow);
InitDockPanel(mainWindow); InitDockPanel(mainWindow);
Editor.Options.OptionsChanged += OnOptionsChanged;
// Add dummy control for drawing the main window borders if using a custom style // Add dummy control for drawing the main window borders if using a custom style
#if PLATFORM_WINDOWS #if PLATFORM_WINDOWS
if (!Editor.Options.Options.Interface.UseNativeWindowSystem) if (!Editor.Options.Options.Interface.UseNativeWindowSystem)
@@ -588,13 +590,10 @@ namespace FlaxEditor.Modules
cm.AddButton("Information about Flax", () => new AboutDialog().Show()); cm.AddButton("Information about Flax", () => new AboutDialog().Show());
} }
/// <summary> private void OnOptionsChanged(FlaxEditor.Options.EditorOptions options)
/// Updates the short cut keys for the main menu
/// </summary>
public void UpdateMainMenuShortcuts()
{ {
var inputOptions = Editor.Options.Options.Input; var inputOptions = options.Input;
_menuSaveAll.ShortKeys = inputOptions.Save.ToString(); _menuSaveAll.ShortKeys = inputOptions.Save.ToString();
_menuEditUndo.ShortKeys = inputOptions.Undo.ToString(); _menuEditUndo.ShortKeys = inputOptions.Undo.ToString();
_menuEditRedo.ShortKeys = inputOptions.Redo.ToString(); _menuEditRedo.ShortKeys = inputOptions.Redo.ToString();
@@ -606,7 +605,7 @@ namespace FlaxEditor.Modules
_menuEditFind.ShortKeys = inputOptions.Search.ToString(); _menuEditFind.ShortKeys = inputOptions.Search.ToString();
_menuGamePlay.ShortKeys = inputOptions.Play.ToString(); _menuGamePlay.ShortKeys = inputOptions.Play.ToString();
_menuGamePause.ShortKeys = inputOptions.Pause.ToString(); _menuGamePause.ShortKeys = inputOptions.Pause.ToString();
MainMenuShortcutKeysUpdated?.Invoke(); MainMenuShortcutKeysUpdated?.Invoke();
} }

2
Source/Editor/Windows/EditorOptionsWindow.cs
View File

@@ -144,8 +144,6 @@ namespace FlaxEditor.Windows
} }
Editor.Options.Apply(_options); Editor.Options.Apply(_options);
Editor.UI.UpdateMainMenuShortcuts();
ClearDirtyFlag(); ClearDirtyFlag();
} }