mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-12-17 11:55:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Windows: reorganize auto-fitting code blocks in Begin(), step 2.

Browse Source 
Toward #9060
This commit is contained in:
ocornut
2025-11-11 21:15:43 +01:00
parent 52e9d94f93
commit b51f6e073c
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
imgui.cpp
View File

@@ -7581,33 +7581,28 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
// - Using SetNextWindowSize() overrides ImGuiWindowFlags_AlwaysAutoResize, so it can be used on tooltips/popups, etc.
// - We still process initial auto-fit on collapsed windows to get a window width, but otherwise don't honor ImGuiWindowFlags_AlwaysAutoResize when collapsed.
// - Auto-fit may only grow window during the first few frames.
const bool size_auto_fit_x_always = !window_size_x_set_by_api && (flags & ImGuiWindowFlags_AlwaysAutoResize) && !window->Collapsed;
const bool size_auto_fit_y_always = !window_size_y_set_by_api && (flags & ImGuiWindowFlags_AlwaysAutoResize) && !window->Collapsed;
const bool size_auto_fit_x_current = !window_size_x_set_by_api && (window->AutoFitFramesX > 0);
const bool size_auto_fit_y_current = !window_size_y_set_by_api && (window->AutoFitFramesY > 0);
const ImVec2 size_auto_fit = CalcWindowAutoFitSize(window, window->ContentSizeIdeal, ~0);
const ImVec2 old_size = window->SizeFull;
if (!window_size_x_set_by_api)
if (size_auto_fit_x_always || size_auto_fit_x_current)
{
if ((flags & ImGuiWindowFlags_AlwaysAutoResize) && !window->Collapsed)
{
if (size_auto_fit_x_always)
window->SizeFull.x = size_auto_fit.x;
use_current_size_for_scrollbar_x = true;
}
else if (window->AutoFitFramesX > 0)
{
else
window->SizeFull.x = window->AutoFitOnlyGrows ? ImMax(window->SizeFull.x, size_auto_fit.x) : size_auto_fit.x;
use_current_size_for_scrollbar_x = true;
}
use_current_size_for_scrollbar_x = true;
}
if (!window_size_y_set_by_api)
if (size_auto_fit_y_always || size_auto_fit_y_current)
{
if ((flags & ImGuiWindowFlags_AlwaysAutoResize) && !window->Collapsed)
{
if (size_auto_fit_y_always)
window->SizeFull.y = size_auto_fit.y;
use_current_size_for_scrollbar_y = true;
}
else if (window->AutoFitFramesY > 0)
{
else
window->SizeFull.y = window->AutoFitOnlyGrows ? ImMax(window->SizeFull.y, size_auto_fit.y) : size_auto_fit.y;
use_current_size_for_scrollbar_y = true;
}
use_current_size_for_scrollbar_y = true;
}
if (old_size.x != window->SizeFull.x || old_size.y != window->SizeFull.y)
MarkIniSettingsDirty(window);