From d60985df7f1a23ea3bd91388a97958fc299dd52f Mon Sep 17 00:00:00 2001 From: ocornut Date: Wed, 16 Nov 2022 17:40:44 +0100 Subject: [PATCH] Inputs: fix moving a window or drag and dropping from capture mods. (#5888, #4921, #456) Amend change of SetActiveIdUsingAllKeyboardKeys() in 4448d97 which seemingly accidentally reverted the change intended by fd408c97 --- docs/CHANGELOG.txt | 7 +++++++ imgui.cpp | 6 +++--- imgui.h | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 9db6158bd..d48152d89 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -31,6 +31,13 @@ HOW TO UPDATE? - Please report any issue! +----------------------------------------------------------------------- + VERSION 1.89.1 (In Progress) +----------------------------------------------------------------------- + + - Inputs: fix moving a window or drag and dropping from capture mods. (#5888, #4921, #456) + + ----------------------------------------------------------------------- VERSION 1.89 (Released 2022-11-15) ----------------------------------------------------------------------- diff --git a/imgui.cpp b/imgui.cpp index 9ce5a2880..83cfd7d87 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.89 +// dear imgui, v1.90 WIP // (main code and documentation) // Help: @@ -8538,7 +8538,7 @@ ImGuiID ImGui::GetKeyOwner(ImGuiKey key) ImGuiID owner_id = owner_data->OwnerCurr; 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 owner_id; @@ -8555,7 +8555,7 @@ bool ImGui::TestKeyOwner(ImGuiKey key, ImGuiID owner_id) ImGuiContext& g = *GImGui; 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; ImGuiKeyOwnerData* owner_data = GetKeyOwnerData(key); diff --git a/imgui.h b/imgui.h index 273de146d..5753b0985 100644 --- a/imgui.h +++ b/imgui.h @@ -22,8 +22,8 @@ // Library Version // (Integer encoded as XYYZZ for use in #if preprocessor conditionals, e.g. '#if IMGUI_VERSION_NUM > 12345') -#define IMGUI_VERSION "1.89" -#define IMGUI_VERSION_NUM 18901 +#define IMGUI_VERSION "1.89.1" +#define IMGUI_VERSION_NUM 18902 #define IMGUI_HAS_TABLE /*