From c18a409a97f0904a3e7ac73ab2bd534a0c70c960 Mon Sep 17 00:00:00 2001 From: ocornut Date: Fri, 20 Mar 2015 23:34:03 +0000 Subject: [PATCH] Auto-filling child window feed their content size to parent - hopefully fix more problem than it causes? #170 --- imgui.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index 526ff293d..72bcc4f3a 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -2727,12 +2727,13 @@ void ImGui::EndChild() } else { - // When using auto-filling child window, we don't provide the width/height to ItemSize so that it doesn't feed back into automatic size-fitting. + // When using auto-filling child window, we don't provide full width/height to ItemSize so that it doesn't feed back into automatic size-fitting. + ImGuiState& g = *GImGui; ImVec2 sz = ImGui::GetWindowSize(); if (window->Flags & ImGuiWindowFlags_ChildWindowAutoFitX) - sz.x = 0; + sz.x = ImMax(g.Style.WindowMinSize.x, sz.x - g.Style.AutoFitPadding.x); if (window->Flags & ImGuiWindowFlags_ChildWindowAutoFitY) - sz.y = 0; + sz.y = ImMax(g.Style.WindowMinSize.y, sz.y - g.Style.AutoFitPadding.y); ImGui::End();