Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-15 01:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tables: non-resizable columns also submit their requested width for auto-fit,

Browse Source
This commit is contained in:
omar 2020-07-21 14:36:31 +02:00 committed by ocornut
parent a0e6aa1766
commit 30e21eb280
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
imgui_tables.cpp
View File

@ -614,6 +614,12 @@ void ImGui::TableUpdateLayout(ImGuiTable* table)
column_width_ideal = ImMax(column_width_ideal, column_content_width_headers); column_width_ideal = ImMax(column_width_ideal, column_content_width_headers);
column_width_ideal = ImMax(column_width_ideal + padding_auto_x, min_column_width); column_width_ideal = ImMax(column_width_ideal + padding_auto_x, min_column_width);
// Non-resizable columns also submit their requested width
if (column->Flags & ImGuiTableColumnFlags_WidthFixed)
if (column->WidthOrWeightInitValue > 0.0f)
if (!(table->Flags & ImGuiTableFlags_Resizable) || !(column->Flags & ImGuiTableColumnFlags_NoResize))
column_width_ideal = ImMax(column_width_ideal, column->WidthOrWeightInitValue);
// CellSpacingX is >0.0f when there's no vertical border // CellSpacingX is >0.0f when there's no vertical border
table->ColumnsAutoFitWidth += column_width_ideal; table->ColumnsAutoFitWidth += column_width_ideal;
if (column->PrevVisibleColumn != -1) if (column->PrevVisibleColumn != -1)