Inputs: fixed moving a window or drag and dropping from preventing in…

…put-owner-unaware code from accessing keys. (#5888, #4921, #456) Amend 4448d97. This is more consistent with input owner design.
ocornut · Nov 16, 2022 · 7bee9a8 · 7bee9a8
1 parent d60985d
commit 7bee9a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -35,7 +35,9 @@ HOW TO UPDATE?
  VERSION 1.89.1 (In Progress)
 -----------------------------------------------------------------------
 
- - Inputs: fix moving a window or drag and dropping from capture mods. (#5888, #4921, #456)
+- Inputs: fixed moving a window or drag and dropping from preventing input-owner-unaware code
+ from accessing keys. (#5888, #4921, #456)
+- Inputs: fixed moving a window or drag and dropping from capturing mods. (#5888, #4921, #456)
 
 
 -----------------------------------------------------------------------

diff --git a/imgui.cpp b/imgui.cpp
@@ -8537,7 +8537,7 @@ ImGuiID ImGui::GetKeyOwner(ImGuiKey key)
  ImGuiKeyOwnerData* owner_data = GetKeyOwnerData(key);
  ImGuiID owner_id = owner_data->OwnerCurr;
 
- if (g.ActiveIdUsingAllKeyboardKeys && owner_id != g.ActiveId)
+ if (g.ActiveIdUsingAllKeyboardKeys && owner_id != g.ActiveId && owner_id != ImGuiKeyOwner_Any)
  if (key >= ImGuiKey_Keyboard_BEGIN && key < ImGuiKey_Keyboard_END)
  return ImGuiKeyOwner_None;
 
@@ -8554,7 +8554,7 @@ bool ImGui::TestKeyOwner(ImGuiKey key, ImGuiID owner_id)
  return true;
 
  ImGuiContext& g = *GImGui;
- if (g.ActiveIdUsingAllKeyboardKeys && owner_id != g.ActiveId)
+ if (g.ActiveIdUsingAllKeyboardKeys && owner_id != g.ActiveId && owner_id != ImGuiKeyOwner_Any)
  if (key >= ImGuiKey_Keyboard_BEGIN && key < ImGuiKey_Keyboard_END)
  return false;