Parcourir la source

Fixes for tooltip over modals leading to incorrect modal dimming. (#4729)

Amend 23ef6c1. Should rework tooltip to be in a consistent position in g.Windows[]
ocornut il y a 3 ans
Parent
commit
e03383d088
2 fichiers modifiés avec 2 ajouts et 2 suppressions
  1. 1 1
      imgui.cpp
  2. 1 1
      imgui.h

+ 1 - 1
imgui.cpp

@@ -4482,7 +4482,7 @@ ImGuiWindow* ImGui::FindBottomMostVisibleWindowWithinBeginStack(ImGuiWindow* par
             continue;
             continue;
         if (!IsWindowWithinBeginStackOf(window, parent_window))
         if (!IsWindowWithinBeginStackOf(window, parent_window))
             break;
             break;
-        if (IsWindowActiveAndVisible(window))
+        if (IsWindowActiveAndVisible(window) && GetWindowDisplayLayer(window) <= GetWindowDisplayLayer(parent_window))
             bottom_most_visible_window = window;
             bottom_most_visible_window = window;
     }
     }
     return bottom_most_visible_window;
     return bottom_most_visible_window;

+ 1 - 1
imgui.h

@@ -64,7 +64,7 @@ Index of this file:
 // Version
 // Version
 // (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY99 then bounce up to XYY00, XYY01 etc. when release tagging happens)
 // (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY99 then bounce up to XYY00, XYY01 etc. when release tagging happens)
 #define IMGUI_VERSION               "1.86 WIP"
 #define IMGUI_VERSION               "1.86 WIP"
-#define IMGUI_VERSION_NUM           18517
+#define IMGUI_VERSION_NUM           18518
 #define IMGUI_CHECKVERSION()        ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx))
 #define IMGUI_CHECKVERSION()        ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx))
 #define IMGUI_HAS_TABLE
 #define IMGUI_HAS_TABLE