Merge branch 'master' into navigation

2017-12-21 11:18:42 +01:00
parent 6497f5dc1b 6193f46af2
commit 4c2514dc29
3 changed files with 25 additions and 20 deletions
@@ -435,9 +435,10 @@ struct ImGuiColumnData
 {
    float               OffsetNorm;         // Column start offset, normalized 0.0 (far left) -> 1.0 (far right)
    float               OffsetNormBeforeResize;
+    ImGuiColumnsFlags   Flags;              // Not exposed
    ImRect              ClipRect;

-    ImGuiColumnData()   { OffsetNorm = OffsetNormBeforeResize = 0.0f; }
+    ImGuiColumnData()   { OffsetNorm = OffsetNormBeforeResize = 0.0f; Flags = 0; }
 };

 struct ImGuiColumnsSet