|
@@ -1,4 +1,4 @@
|
|
-// dear imgui, v1.89
|
|
|
|
|
|
+// dear imgui, v1.90 WIP
|
|
// (main code and documentation)
|
|
// (main code and documentation)
|
|
|
|
|
|
// Help:
|
|
// Help:
|
|
@@ -8538,7 +8538,7 @@ ImGuiID ImGui::GetKeyOwner(ImGuiKey key)
|
|
ImGuiID owner_id = owner_data->OwnerCurr;
|
|
ImGuiID owner_id = owner_data->OwnerCurr;
|
|
|
|
|
|
if (g.ActiveIdUsingAllKeyboardKeys && owner_id != g.ActiveId)
|
|
if (g.ActiveIdUsingAllKeyboardKeys && owner_id != g.ActiveId)
|
|
- if ((key >= ImGuiKey_Keyboard_BEGIN && key < ImGuiKey_Keyboard_END) || key == ImGuiMod_Ctrl || key == ImGuiMod_Shift || key == ImGuiMod_Alt || key == ImGuiMod_Super)
|
|
|
|
|
|
+ if (key >= ImGuiKey_Keyboard_BEGIN && key < ImGuiKey_Keyboard_END)
|
|
return ImGuiKeyOwner_None;
|
|
return ImGuiKeyOwner_None;
|
|
|
|
|
|
return owner_id;
|
|
return owner_id;
|
|
@@ -8555,7 +8555,7 @@ bool ImGui::TestKeyOwner(ImGuiKey key, ImGuiID owner_id)
|
|
|
|
|
|
ImGuiContext& g = *GImGui;
|
|
ImGuiContext& g = *GImGui;
|
|
if (g.ActiveIdUsingAllKeyboardKeys && owner_id != g.ActiveId)
|
|
if (g.ActiveIdUsingAllKeyboardKeys && owner_id != g.ActiveId)
|
|
- if ((key >= ImGuiKey_Keyboard_BEGIN && key < ImGuiKey_Keyboard_END) || key == ImGuiMod_Ctrl || key == ImGuiMod_Shift || key == ImGuiMod_Alt || key == ImGuiMod_Super)
|
|
|
|
|
|
+ if (key >= ImGuiKey_Keyboard_BEGIN && key < ImGuiKey_Keyboard_END)
|
|
return false;
|
|
return false;
|
|
|
|
|
|
ImGuiKeyOwnerData* owner_data = GetKeyOwnerData(key);
|
|
ImGuiKeyOwnerData* owner_data = GetKeyOwnerData(key);
|