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

2026-04-02 13:37:40 -05:00 · 2016-09-25 12:59:24 +02:00
parent f39513ac47 35c6fd682f
commit ed279c0095
34 changed files with 157 additions and 121 deletions
--- a/imgui_internal.h
+++ b/imgui_internal.h
@@ -277,6 +277,7 @@ struct ImGuiGroupData
    ImVec2      BackupCursorPos;
    ImVec2      BackupCursorMaxPos;
    float       BackupIndentX;
+    float       BackupGroupOffsetX;
    float       BackupCurrentLineHeight;
    float       BackupCurrentLineTextBaseOffset;
    float       BackupLogLinePosY;