Merge remote-tracking branch 'origin' into 2016-07-navigation

2025-07-04 12:08:47 +02:00 · 2016-07-30 23:46:09 +02:00
parent 68b73b61b5 954c890c67
commit f72e2fd1b1
3 changed files with 13 additions and 7 deletions
--- a/imgui_internal.h
+++ b/imgui_internal.h
@ -618,6 +618,7 @@ struct IMGUI_API ImGuiDrawContext
    int                     StackSizesBackup[6];    // Store size of various stacks for asserting

    float                   IndentX;                // Indentation / start position from left of window (increased by TreePush/TreePop, etc.)
+    float                   GroupOffsetX;
    float                   ColumnsOffsetX;         // Offset to the current column (if ColumnsCurrent > 0). FIXME: This and the above should be a stack to allow use cases like Tree->Column->Tree. Need revamp columns API.
    int                     ColumnsCurrent;
    int                     ColumnsCount;