|
|
|
@ -3747,9 +3747,9 @@ bool ImGui::BeginPopupModal(const char* name, bool* p_open, ImGuiWindowFlags ext |
|
|
|
|
|
|
|
|
|
void ImGui::EndPopup() |
|
|
|
|
{ |
|
|
|
|
ImGuiWindow* window = GetCurrentWindow(); |
|
|
|
|
IM_ASSERT(window->Flags & ImGuiWindowFlags_Popup); // Mismatched BeginPopup()/EndPopup() calls
|
|
|
|
|
IM_ASSERT(GImGui->CurrentPopupStack.Size > 0); |
|
|
|
|
ImGuiContext& g = *GImGui; (void)g; |
|
|
|
|
IM_ASSERT(g.CurrentWindow->Flags & ImGuiWindowFlags_Popup); // Mismatched BeginPopup()/EndPopup() calls
|
|
|
|
|
IM_ASSERT(g.CurrentPopupStack.Size > 0); |
|
|
|
|
End(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -4278,7 +4278,6 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) |
|
|
|
|
window->WindowPadding = ImVec2(0.0f, (flags & ImGuiWindowFlags_MenuBar) ? style.WindowPadding.y : 0.0f); |
|
|
|
|
const float window_rounding = window->WindowRounding; |
|
|
|
|
const float window_border_size = window->WindowBorderSize; |
|
|
|
|
const ImVec2 window_padding = window->WindowPadding; |
|
|
|
|
|
|
|
|
|
// Calculate auto-fit size, handle automatic resize
|
|
|
|
|
const ImVec2 size_auto_fit = CalcSizeAutoFit(window); |
|
|
|
|