Merge branch 'console-hotkey' of https://github.com/Zode/FlaxEngine into Zode-console-hotkey
This commit is contained in:
@@ -139,6 +139,10 @@ namespace FlaxEditor.Options
|
|||||||
[EditorDisplay("Common"), EditorOrder(240)]
|
[EditorDisplay("Common"), EditorOrder(240)]
|
||||||
public InputBinding ToggleFullscreen = new InputBinding(KeyboardKeys.F11);
|
public InputBinding ToggleFullscreen = new InputBinding(KeyboardKeys.F11);
|
||||||
|
|
||||||
|
[DefaultValue(typeof(InputBinding), "Ctrl+BackQuote")]
|
||||||
|
[EditorDisplay("Common"), EditorOrder(250)]
|
||||||
|
public InputBinding FocusConsoleCommand = new InputBinding(KeyboardKeys.BackQuote, KeyboardKeys.Control);
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region File
|
#region File
|
||||||
|
|||||||
@@ -1518,6 +1518,7 @@ namespace FlaxEditor.Utilities
|
|||||||
inputActions.Add(options => options.OpenScriptsProject, () => Editor.Instance.CodeEditing.OpenSolution());
|
inputActions.Add(options => options.OpenScriptsProject, () => Editor.Instance.CodeEditing.OpenSolution());
|
||||||
inputActions.Add(options => options.GenerateScriptsProject, () => Editor.Instance.ProgressReporting.GenerateScriptsProjectFiles.RunAsync());
|
inputActions.Add(options => options.GenerateScriptsProject, () => Editor.Instance.ProgressReporting.GenerateScriptsProjectFiles.RunAsync());
|
||||||
inputActions.Add(options => options.RecompileScripts, ScriptsBuilder.Compile);
|
inputActions.Add(options => options.RecompileScripts, ScriptsBuilder.Compile);
|
||||||
|
inputActions.Add(options => options.FocusConsoleCommand, () => Editor.Instance.Windows.OutputLogWin.FocusCommand());
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static string ToPathProject(string path)
|
internal static string ToPathProject(string path)
|
||||||
|
|||||||
@@ -405,6 +405,7 @@ namespace FlaxEditor.Windows
|
|||||||
return;
|
return;
|
||||||
Editor.Instance.SceneEditing.Delete();
|
Editor.Instance.SceneEditing.Delete();
|
||||||
});
|
});
|
||||||
|
InputActions.Add(options => options.FocusConsoleCommand, () => Editor.Instance.Windows.OutputLogWin.FocusCommand());
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ChangeViewportRatio(ViewportScaleOptions v)
|
private void ChangeViewportRatio(ViewportScaleOptions v)
|
||||||
|
|||||||
@@ -830,6 +830,15 @@ namespace FlaxEditor.Windows
|
|||||||
OnOutputTextChanged();
|
OnOutputTextChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Focus the debug command line and ensure that the output log window is visible.
|
||||||
|
/// </summary>
|
||||||
|
public void FocusCommand()
|
||||||
|
{
|
||||||
|
FocusOrShow();
|
||||||
|
_commandLineBox.Focus();
|
||||||
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public override void Update(float deltaTime)
|
public override void Update(float deltaTime)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user