anulax
/
imgui-docking
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Fixed GetId()/BeginPopup() accessing current window in "append" mode

Browse Source
features/sdl_renderer3_multiviewports
ocornut ago%!(EXTRA string=10 years)
parent 8c4c421f74
commit 5b0861768e
1 changed files with 4 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      imgui.cpp

11
imgui.cpp
Unescape View File

@ -3131,7 +3131,7 @@ static void ClearSetNextWindowData()
static bool BeginPopupEx(const char* str_id, ImGuiWindowFlags extra_flags) static bool BeginPopupEx(const char* str_id, ImGuiWindowFlags extra_flags)
{ {
ImGuiState& g = *GImGui; ImGuiState& g = *GImGui;
ImGuiWindow* window = GetCurrentWindow(); ImGuiWindow* window = g.CurrentWindow;
const ImGuiID id = window->GetID(str_id); const ImGuiID id = window->GetID(str_id);
if (!IsPopupOpen(id)) if (!IsPopupOpen(id))
{ {
@ -5454,20 +5454,17 @@ void ImGui::PopID()
ImGuiID ImGui::GetID(const char* str_id) ImGuiID ImGui::GetID(const char* str_id)
{ {
ImGuiWindow* window = GetCurrentWindow(); return GImGui->CurrentWindow->GetID(str_id);
return window->GetID(str_id);
} }
ImGuiID ImGui::GetID(const char* str_id_begin, const char* str_id_end) ImGuiID ImGui::GetID(const char* str_id_begin, const char* str_id_end)
{ {
ImGuiWindow* window = GetCurrentWindow(); return GImGui->CurrentWindow->GetID(str_id_begin, str_id_end);
return window->GetID(str_id_begin, str_id_end);
} }
ImGuiID ImGui::GetID(const void* ptr_id) ImGuiID ImGui::GetID(const void* ptr_id)
{ {
ImGuiWindow* window = GetCurrentWindow(); return GImGui->CurrentWindow->GetID(ptr_id);
return window->GetID(ptr_id);
} }
// User can input math operators (e.g. +100) to edit a numerical values. // User can input math operators (e.g. +100) to edit a numerical values.

Write Preview
Loading…
Cancel
Save