Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-12 15:59:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tables: Made only first column honor Indent by default (like Columns api) and exposed flags. Added simple Tree demo.

Browse Source
This commit is contained in:
omar
2020-01-09 21:10:45 +01:00
committed by ocornut
parent 2958e37310
commit 0e7b3f2f2f
4 changed files with 89 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
imgui_tables.cpp
View File

@ -236,6 +236,7 @@ bool ImGui::BeginTableEx(const char* name, ImGuiID id, int columns_count, ImG
// Backup a copy of host window members we will modify
ImGuiWindow* inner_window = table->InnerWindow;
table->HostIndentX = inner_window->DC.Indent.x;
table->HostClipRect = inner_window->ClipRect;
table->HostSkipItems = inner_window->SkipItems;
table->HostWorkRect = inner_window->WorkRect;
@ -552,6 +553,8 @@ void ImGui::TableUpdateLayout(ImGuiTable* table)
// Adjust flags: default width mode + weighted columns are not allowed when auto extending
// FIXME-TABLE: Clarify why we need to do this again here and not just in TableSetupColumn()
column->Flags = TableFixColumnFlags(table, column->FlagsIn);
if ((column->Flags & ImGuiTableColumnFlags_IndentMask_) == 0)
column->Flags |= (column_n == 0) ? ImGuiTableColumnFlags_IndentEnable : ImGuiTableColumnFlags_IndentDisable;
// We have a unusual edge case where if the user doesn't call TableGetSortSpecs() but has sorting enabled
// or varying sorting flags, we still want the sorting arrows to honor those flags.
@ -1580,7 +1583,9 @@ void ImGui::TableBeginCell(ImGuiTable* table, int column_no)
ImGuiTableColumn* column = &table->Columns[column_no];
ImGuiWindow* window = table->InnerWindow;
const float start_x = (table->RowFlags & ImGuiTableRowFlags_Headers) ? column->StartXHeaders : column->StartXRows;
float start_x = (table->RowFlags & ImGuiTableRowFlags_Headers) ? column->StartXHeaders : column->StartXRows;
if (column->Flags & ImGuiTableColumnFlags_IndentEnable)
start_x += window->DC.Indent.x - table->HostIndentX;
window->DC.LastItemId = 0;
window->DC.CursorPos.x = start_x;