MultiSelect: Temporary fix/work-around for child/popup to not inherit MultiSelectEnabled flag, until we make mulit-select data stackable.

2024-07-18 18:19:12 +02:00
parent 00c4b8f2a3
commit b9721c1ed7
3 changed files with 17 additions and 9 deletions
@@ -2120,9 +2120,9 @@ struct ImGuiContext
    ImVec2                  NavWindowingAccumDeltaSize;

    // Range-Select/Multi-Select
-    bool                    MultiSelectEnabled;
+    ImGuiWindow*            MultiSelectEnabledWindow;           // FIXME-MULTISELECT: We currently don't support recursing/stacking multi-select
    ImGuiMultiSelectFlags   MultiSelectFlags;
-    ImGuiMultiSelectState   MultiSelectState;                   // We currently don't support recursing/stacking multi-select
+    ImGuiMultiSelectState   MultiSelectState;
    ImGuiKeyChord           MultiSelectKeyMods;

    // Render
@@ -2388,7 +2388,7 @@ struct ImGuiContext
        NavWindowingToggleLayer = false;
        NavWindowingToggleKey = ImGuiKey_None;

-        MultiSelectEnabled = false;
+        MultiSelectEnabledWindow = NULL;
        MultiSelectFlags = ImGuiMultiSelectFlags_None;
        MultiSelectKeyMods = ImGuiMod_None;