Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-12-03 03:37:24 +01:00
Code Releases Wiki Activity

Auto-filling child window feed their content size to parent - hopefully fix more problem than it causes? #170

Browse Source
This commit is contained in:
ocornut 2015-03-20 23:34:03 +00:00
parent f32d92f842
commit c18a409a97
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
imgui.cpp
View File

@ -2727,12 +2727,13 @@ void ImGui::EndChild()
} }
else 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(); ImVec2 sz = ImGui::GetWindowSize();
if (window->Flags & ImGuiWindowFlags_ChildWindowAutoFitX) 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) if (window->Flags & ImGuiWindowFlags_ChildWindowAutoFitY)
sz.y = 0; sz.y = ImMax(g.Style.WindowMinSize.y, sz.y - g.Style.AutoFitPadding.y);
ImGui::End(); ImGui::End();