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:
Wojtek Figat
2024-03-04 18:33:16 +01:00
13 changed files with 222 additions and 77 deletions

View File

@@ -1,6 +1,9 @@
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
using System;
#if FLAX_EDITOR
using FlaxEditor.Options;
#endif
using FlaxEngine.Assertions;
using FlaxEngine.Utilities;
@@ -1296,6 +1299,42 @@ namespace FlaxEngine.GUI
bool ctrDown = window.GetKey(KeyboardKeys.Control);
KeyDown?.Invoke(key);
// Handle controls that have bindings
#if FLAX_EDITOR
InputOptions options = FlaxEditor.Editor.Instance.Options.Options.Input;
if (options.Copy.Process(this))
{
Copy();
return true;
}
else if (options.Paste.Process(this))
{
Paste();
return true;
}
else if (options.Duplicate.Process(this))
{
Duplicate();
return true;
}
else if (options.Cut.Process(this))
{
Cut();
return true;
}
else if (options.SelectAll.Process(this))
{
SelectAll();
return true;
}
else if (options.DeselectAll.Process(this))
{
Deselect();
return true;
}
#endif
// Handle controls without bindings
switch (key)
{
case KeyboardKeys.ArrowRight: