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

Merge branch 'Tryibion-add-search-focus'

Browse Source
This commit is contained in:
Wojtek Figat
2024-03-19 20:15:20 +01:00
parent 5082fa3e51 4f1e8add76
commit 57568d9cc3
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Editor/Windows/ContentWindow.cs
View File

@@ -281,6 +281,9 @@ namespace FlaxEditor.Windows
_view.OnDelete += Delete; _view.OnDelete += Delete;
_view.OnDuplicate += Duplicate; _view.OnDuplicate += Duplicate;
_view.OnPaste += Paste; _view.OnPaste += Paste;
_view.InputActions.Add(options => options.Search, () => _itemsSearchBox.Focus());
InputActions.Add(options => options.Search, () => _itemsSearchBox.Focus());
} }
private ContextMenu OnViewDropdownPopupCreate(ComboBox comboBox) private ContextMenu OnViewDropdownPopupCreate(ComboBox comboBox)

16
Source/Editor/Windows/OutputLogWindow.cs
View File

@@ -65,6 +65,11 @@ namespace FlaxEditor.Windows
/// </summary> /// </summary>
public OutputLogWindow Window; public OutputLogWindow Window;
/// <summary>
/// The input actions collection to processed during user input.
/// </summary>
public InputActionsContainer InputActions = new InputActionsContainer();
/// <summary> /// <summary>
/// The default text style. /// The default text style.
/// </summary> /// </summary>
@@ -80,6 +85,14 @@ namespace FlaxEditor.Windows
/// </summary> /// </summary>
public TextBlockStyle ErrorStyle; public TextBlockStyle ErrorStyle;
/// <inheritdoc />
public override bool OnKeyDown(KeyboardKeys key)
{
if (InputActions.Process(Editor.Instance, this, key))
return true;
return base.OnKeyDown(key);
}
/// <inheritdoc /> /// <inheritdoc />
protected override void OnParseTextBlocks() protected override void OnParseTextBlocks()
{ {
@@ -201,6 +214,9 @@ namespace FlaxEditor.Windows
// Setup editor options // Setup editor options
Editor.Options.OptionsChanged += OnEditorOptionsChanged; Editor.Options.OptionsChanged += OnEditorOptionsChanged;
OnEditorOptionsChanged(Editor.Options.Options); OnEditorOptionsChanged(Editor.Options.Options);
_output.InputActions.Add(options => options.Search, () => _searchBox.Focus());
InputActions.Add(options => options.Search, () => _searchBox.Focus());
GameCooker.Event += OnGameCookerEvent; GameCooker.Event += OnGameCookerEvent;
ScriptsBuilder.CompilationFailed += OnScriptsCompilationFailed; ScriptsBuilder.CompilationFailed += OnScriptsCompilationFailed;