Skip to content

Fix ModKeys mapping allowing for keyboard shortcuts #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DarkDestry wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix ModKeys mapping allowing for keyboard shortcuts #79

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c275f3d
Fix mod keys not working due to multiple keycode mapping to a single key
DarkDestry Apr 2, 2025
f8d1489
Add OSX command mapping for mod keys
DarkDestry Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions Source/Platform/InputManagerPlatform.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ private void UpdateKeyboard(ImGuiIOPtr io)
}
}

// Handle mod keys separately as 2 buttons map to 1 key
io.AddKeyEvent(ImGuiKey.ModShift, Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift));
io.AddKeyEvent(ImGuiKey.ModCtrl, Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.RightControl));
io.AddKeyEvent(ImGuiKey.ModAlt, Input.GetKey(KeyCode.LeftAlt) || Input.GetKey(KeyCode.RightAlt));
#if UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IOS
io.AddKeyEvent(ImGuiKey.ModSuper, Input.GetKey(KeyCode.LeftCommand) || Input.GetKey(KeyCode.RightCommand));
#else
io.AddKeyEvent(ImGuiKey.ModSuper, Input.GetKey(KeyCode.LeftWindows) || Input.GetKey(KeyCode.RightWindows));
#endif

// Text input.
while (Event.PopEvent(_textInputEvent))
{
Expand Down Expand Up @@ -87,11 +97,19 @@ static ImGuiKey KeyToImGuiKeyShortcut(KeyCode keyToConvert, KeyCode startKey1, I
>= KeyCode.Keypad0 and <= KeyCode.Keypad9 => KeyToImGuiKeyShortcut(key, KeyCode.Keypad0, ImGuiKey.Keypad0),
>= KeyCode.A and <= KeyCode.Z => KeyToImGuiKeyShortcut(key, KeyCode.A, ImGuiKey.A),
>= KeyCode.Alpha0 and <= KeyCode.Alpha9 => KeyToImGuiKeyShortcut(key, KeyCode.Alpha0, ImGuiKey._0),
// BUG: mod keys make everything slow.
// KeyCode.LeftShift or KeyCode.RightShift => ImGuiKey.ModShift,
// KeyCode.LeftControl or KeyCode.RightControl => ImGuiKey.ModCtrl,
// KeyCode.LeftAlt or KeyCode.RightAlt => ImGuiKey.ModAlt,
// KeyCode.LeftWindows or KeyCode.RightWindows => ImGuiKey.ModSuper,
KeyCode.LeftControl => ImGuiKey.LeftCtrl,
KeyCode.RightControl => ImGuiKey.RightCtrl,
KeyCode.LeftShift => ImGuiKey.LeftShift,
KeyCode.RightShift => ImGuiKey.RightShift,
KeyCode.LeftAlt => ImGuiKey.LeftAlt,
KeyCode.RightAlt => ImGuiKey.RightAlt,
#if UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IOS
KeyCode.LeftCommand => ImGuiKey.LeftSuper,
KeyCode.RightCommand => ImGuiKey.RightSuper,
#else
KeyCode.LeftWindows => ImGuiKey.LeftSuper,
KeyCode.RightWindows => ImGuiKey.RightSuper,
#endif
KeyCode.Menu => ImGuiKey.Menu,
KeyCode.UpArrow => ImGuiKey.UpArrow,
KeyCode.DownArrow => ImGuiKey.DownArrow,
Expand Down Expand Up @@ -137,4 +155,4 @@ static ImGuiKey KeyToImGuiKeyShortcut(KeyCode keyToConvert, KeyCode startKey1, I
return imguikey != ImGuiKey.None;
}
}
}
}