Browse Source

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
ocornut 2 years ago
parent
commit
d60985df7f
3 changed files with 12 additions and 5 deletions
  1. 7 0
      docs/CHANGELOG.txt
  2. 3 3
      imgui.cpp
  3. 2 2
      imgui.h

+ 7 - 0
docs/CHANGELOG.txt

@@ -31,6 +31,13 @@ HOW TO UPDATE?
 - Please report any issue!
 - 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)
  VERSION 1.89 (Released 2022-11-15)
 -----------------------------------------------------------------------
 -----------------------------------------------------------------------

+ 3 - 3
imgui.cpp

@@ -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);

+ 2 - 2
imgui.h

@@ -22,8 +22,8 @@
 
 
 // Library Version
 // Library Version
 // (Integer encoded as XYYZZ for use in #if preprocessor conditionals, e.g. '#if IMGUI_VERSION_NUM > 12345')
 // (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
 #define IMGUI_HAS_TABLE
 
 
 /*
 /*