|
@@ -8407,7 +8407,7 @@ IM_MSVC_RUNTIME_CHECKS_RESTORE
|
|
|
//-----------------------------------------------------------------------------
|
|
|
// [SECTION] INPUTS
|
|
|
//-----------------------------------------------------------------------------
|
|
|
-// - GetModForModKey() [Internal]
|
|
|
+// - GetModForLRModKey() [Internal]
|
|
|
// - FixupKeyChord() [Internal]
|
|
|
// - GetKeyData() [Internal]
|
|
|
// - GetKeyIndex() [Internal]
|
|
@@ -8470,7 +8470,7 @@ IM_MSVC_RUNTIME_CHECKS_RESTORE
|
|
|
// - Shortcut() [Internal]
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
|
|
-static ImGuiKeyChord GetModForModKey(ImGuiKey key)
|
|
|
+static ImGuiKeyChord GetModForLRModKey(ImGuiKey key)
|
|
|
{
|
|
|
if (key == ImGuiKey_LeftCtrl || key == ImGuiKey_RightCtrl)
|
|
|
return ImGuiMod_Ctrl;
|
|
@@ -8487,8 +8487,8 @@ ImGuiKeyChord ImGui::FixupKeyChord(ImGuiKeyChord key_chord)
|
|
|
{
|
|
|
// Add ImGuiMod_XXXX when a corresponding ImGuiKey_LeftXXX/ImGuiKey_RightXXX is specified.
|
|
|
ImGuiKey key = (ImGuiKey)(key_chord & ~ImGuiMod_Mask_);
|
|
|
- if (IsModKey(key))
|
|
|
- key_chord |= GetModForModKey(key);
|
|
|
+ if (IsLRModKey(key))
|
|
|
+ key_chord |= GetModForLRModKey(key);
|
|
|
return key_chord;
|
|
|
}
|
|
|
|
|
@@ -8579,8 +8579,8 @@ const char* ImGui::GetKeyChordName(ImGuiKeyChord key_chord)
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
|
|
|
const ImGuiKey key = (ImGuiKey)(key_chord & ~ImGuiMod_Mask_);
|
|
|
- if (IsModKey(key))
|
|
|
- key_chord &= ~GetModForModKey(key); // Return "Ctrl+LeftShift" instead of "Ctrl+Shift+LeftShift"
|
|
|
+ if (IsLRModKey(key))
|
|
|
+ key_chord &= ~GetModForLRModKey(key); // Return "Ctrl+LeftShift" instead of "Ctrl+Shift+LeftShift"
|
|
|
ImFormatString(g.TempKeychordName, IM_ARRAYSIZE(g.TempKeychordName), "%s%s%s%s%s",
|
|
|
(key_chord & ImGuiMod_Ctrl) ? "Ctrl+" : "",
|
|
|
(key_chord & ImGuiMod_Shift) ? "Shift+" : "",
|