mirror/sbox-public
1
0
Fork 0
mirror of https://github.com/Facepunch/sbox-public.git synced 2025-12-23 22:48:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

fallback to shortcut without modifier if the shortcut doesn't exist with modifier (allows things like tool switching while modifier is down) (#3653)

Browse Source
This commit is contained in:
Layla
2025-12-22 08:32:18 +00:00
committed by GitHub
parent 35aedbbd79
commit 99ed8d97b2
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
engine/Sandbox.Tools/ManagedTools.cs
View File

@@ -178,23 +178,28 @@ internal static class ManagedTools
if ( press ) if ( press )
{ {
var modifiers = ev.KeyboardModifiers; var modifiers = ev.KeyboardModifiers;
var keys = ev.Name; var baseKey = ev.Name.ToUpperInvariant();
var modifiedKey = baseKey;
if ( modifiers != KeyboardModifiers.None ) if ( modifiers != KeyboardModifiers.None )
{ {
EditorShortcuts.Press( ev.Name.ToUpperInvariant() ); EditorShortcuts.Press( baseKey );
if ( modifiers.HasFlag( KeyboardModifiers.Shift ) && ev.Key != KeyCode.Shift ) keys = "SHIFT+" + keys; if ( modifiers.HasFlag( KeyboardModifiers.Shift ) && ev.Key != KeyCode.Shift ) modifiedKey = "SHIFT+" + modifiedKey;
if ( modifiers.HasFlag( KeyboardModifiers.Alt ) && ev.Key != KeyCode.Alt ) keys = "ALT+" + keys; if ( modifiers.HasFlag( KeyboardModifiers.Alt ) && ev.Key != KeyCode.Alt ) modifiedKey = "ALT+" + modifiedKey;
if ( modifiers.HasFlag( KeyboardModifiers.Ctrl ) && ev.Key != KeyCode.Control ) keys = "CTRL+" + keys; if ( modifiers.HasFlag( KeyboardModifiers.Ctrl ) && ev.Key != KeyCode.Control ) modifiedKey = "CTRL+" + modifiedKey;
} }
// If we're "in game" these will be passed by the InputRouter whilst we're not focused // If we're "in game" these will be passed by the InputRouter whilst we're not focused
if ( EditorShortcuts._timeSinceGlobalShortcut <= 0.05f && ev.Key >= KeyCode.F1 && ev.Key <= KeyCode.F12 ) if ( EditorShortcuts._timeSinceGlobalShortcut <= 0.05f && ev.Key >= KeyCode.F1 && ev.Key <= KeyCode.F12 )
{
return false; return false;
}
if ( EditorShortcuts.Invoke( keys.ToUpperInvariant() ) ) return true; // Try with modifier first.
if ( modifiers != KeyboardModifiers.None && EditorShortcuts.Invoke( modifiedKey ) )
return true;
// If no shortcut was invoked with modifier, try without.
if ( EditorShortcuts.Invoke( baseKey ) )
return true;
} }
else else
{ {