Merge branch 'Tryibion-add-search-focus'
This commit is contained in:
@@ -281,6 +281,9 @@ namespace FlaxEditor.Windows
|
||||
_view.OnDelete += Delete;
|
||||
_view.OnDuplicate += Duplicate;
|
||||
_view.OnPaste += Paste;
|
||||
|
||||
_view.InputActions.Add(options => options.Search, () => _itemsSearchBox.Focus());
|
||||
InputActions.Add(options => options.Search, () => _itemsSearchBox.Focus());
|
||||
}
|
||||
|
||||
private ContextMenu OnViewDropdownPopupCreate(ComboBox comboBox)
|
||||
|
||||
@@ -65,6 +65,11 @@ namespace FlaxEditor.Windows
|
||||
/// </summary>
|
||||
public OutputLogWindow Window;
|
||||
|
||||
/// <summary>
|
||||
/// The input actions collection to processed during user input.
|
||||
/// </summary>
|
||||
public InputActionsContainer InputActions = new InputActionsContainer();
|
||||
|
||||
/// <summary>
|
||||
/// The default text style.
|
||||
/// </summary>
|
||||
@@ -80,6 +85,14 @@ namespace FlaxEditor.Windows
|
||||
/// </summary>
|
||||
public TextBlockStyle ErrorStyle;
|
||||
|
||||
/// <inheritdoc />
|
||||
public override bool OnKeyDown(KeyboardKeys key)
|
||||
{
|
||||
if (InputActions.Process(Editor.Instance, this, key))
|
||||
return true;
|
||||
return base.OnKeyDown(key);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void OnParseTextBlocks()
|
||||
{
|
||||
@@ -201,6 +214,9 @@ namespace FlaxEditor.Windows
|
||||
// Setup editor options
|
||||
Editor.Options.OptionsChanged += OnEditorOptionsChanged;
|
||||
OnEditorOptionsChanged(Editor.Options.Options);
|
||||
|
||||
_output.InputActions.Add(options => options.Search, () => _searchBox.Focus());
|
||||
InputActions.Add(options => options.Search, () => _searchBox.Focus());
|
||||
|
||||
GameCooker.Event += OnGameCookerEvent;
|
||||
ScriptsBuilder.CompilationFailed += OnScriptsCompilationFailed;
|
||||
|
||||
Reference in New Issue
Block a user