Merge branch 'input-settings-changes' of https://github.com/Menotdan/FlaxEngine into Menotdan-input-settings-changes
# Conflicts: # Source/Editor/Modules/UIModule.cs
This commit is contained in:
@@ -170,6 +170,8 @@ namespace FlaxEditor.Windows
|
||||
/// <inheritdoc />
|
||||
public override bool OnKeyDown(KeyboardKeys key)
|
||||
{
|
||||
InputOptions options = FlaxEditor.Editor.Instance.Options.Options.Input;
|
||||
|
||||
// Up
|
||||
if (key == KeyboardKeys.ArrowUp)
|
||||
{
|
||||
@@ -200,7 +202,7 @@ namespace FlaxEditor.Windows
|
||||
Open();
|
||||
}
|
||||
// Ctrl+C
|
||||
else if (key == KeyboardKeys.C && Root.GetKey(KeyboardKeys.Control))
|
||||
else if (options.Copy.Process(this))
|
||||
{
|
||||
Copy();
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user