Merge pull request #16 from KCoen/docking

Change imgui submodule to docking branch
aybe · Feb 21, 2023 · 36b43ba · 36b43ba
2 parents c1c89ce + 9cc20e1
commit 36b43ba
Show file tree

Hide file tree

Showing 10 changed files with 4,345 additions and 2,225 deletions.
diff --git a/DearGenerator/TypeMaps/TypeMapEnumImGui.tt b/DearGenerator/TypeMaps/TypeMapEnumImGui.tt
@@ -35,7 +35,8 @@
 		"ImGuiTableRowFlags",
 		"ImGuiTreeNodeFlags",
 		"ImGuiViewportFlags",
-		"ImGuiWindowFlags"
+		"ImGuiWindowFlags",
+		"ImGuiDockNodeFlags"
 	};
 
 	Generate(types, "Constants.ImGuiNamespace");

diff --git a/DearImGui.Generator/LibraryImGui.cs b/DearImGui.Generator/LibraryImGui.cs
@@ -72,27 +72,29 @@ protected override void PostprocessIgnores(ASTContext ctx)
     {
         base.PostprocessIgnores(ctx);
 
-        Ignore(ctx, "ImDrawData",            "CmdLists",        IgnoreType.Property); // manual
-        Ignore(ctx, "ImDrawList",            "ClipRectStack",   IgnoreType.Property); // intern
-        Ignore(ctx, "ImDrawList",            "CmdHeader",       IgnoreType.Property); // intern
-        Ignore(ctx, "ImDrawList",            "Data",            IgnoreType.Property); // intern
-        Ignore(ctx, "ImDrawList",            "FringeScale",     IgnoreType.Property); // intern
-        Ignore(ctx, "ImDrawList",            "IdxWritePtr",     IgnoreType.Property); // intern
-        Ignore(ctx, "ImDrawList",            "OwnerName",       IgnoreType.Property); // intern
-        Ignore(ctx, "ImDrawList",            "Path",            IgnoreType.Property); // intern
-        Ignore(ctx, "ImDrawList",            "Splitter",        IgnoreType.Property); // intern
-        Ignore(ctx, "ImDrawList",            "TextureIdStack",  IgnoreType.Property); // intern
-        Ignore(ctx, "ImDrawList",            "VtxCurrentIdx",   IgnoreType.Property); // intern
-        Ignore(ctx, "ImDrawList",            "VtxWritePtr",     IgnoreType.Property); // intern
-        Ignore(ctx, "ImFontAtlas",           "IsBuilt",         IgnoreType.Property); // manual
-        Ignore(ctx, "ImFontAtlas",           "TexUvLines",      IgnoreType.Property); // manual
-        Ignore(ctx, "ImFontAtlasCustomRect", "IsPacked",        IgnoreType.Property); // manual
-        Ignore(ctx, "ImFontConfig",          "Name",            IgnoreType.Property); // manual
-        Ignore(ctx, "ImFontGlyph",           "Colored",         IgnoreType.Property); // manual
-        Ignore(ctx, "ImFontGlyph",           "Visible",         IgnoreType.Property); // manual
-        Ignore(ctx, "ImFontGlyph",           "Codepoint",       IgnoreType.Property); // manual
-        Ignore(ctx, "ImGuiIO",               "MouseClickedPos", IgnoreType.Property); // manual
-        Ignore(ctx, "ImGuiStyle",            "Colors",          IgnoreType.Property); // manual
+        Ignore(ctx, "ImDrawData",            "CmdLists",                IgnoreType.Property); // manual
+        Ignore(ctx, "ImDrawList",            "ClipRectStack",           IgnoreType.Property); // intern
+        Ignore(ctx, "ImDrawList",            "CmdHeader",               IgnoreType.Property); // intern
+        Ignore(ctx, "ImDrawList",            "Data",                    IgnoreType.Property); // intern
+        Ignore(ctx, "ImDrawList",            "FringeScale",             IgnoreType.Property); // intern
+        Ignore(ctx, "ImDrawList",            "IdxWritePtr",             IgnoreType.Property); // intern
+        Ignore(ctx, "ImDrawList",            "OwnerName",               IgnoreType.Property); // intern
+        Ignore(ctx, "ImDrawList",            "Path",                    IgnoreType.Property); // intern
+        Ignore(ctx, "ImDrawList",            "Splitter",                IgnoreType.Property); // intern
+        Ignore(ctx, "ImDrawList",            "TextureIdStack",          IgnoreType.Property); // intern
+        Ignore(ctx, "ImDrawList",            "VtxCurrentIdx",           IgnoreType.Property); // intern
+        Ignore(ctx, "ImDrawList",            "VtxWritePtr",             IgnoreType.Property); // intern
+        Ignore(ctx, "ImFontAtlas",           "IsBuilt",                 IgnoreType.Property); // manual
+        Ignore(ctx, "ImFontAtlas",           "TexUvLines",              IgnoreType.Property); // manual
+        Ignore(ctx, "ImFontAtlasCustomRect", "IsPacked",                IgnoreType.Property); // manual
+        Ignore(ctx, "ImFontConfig",          "Name",                    IgnoreType.Property); // manual
+        Ignore(ctx, "ImFontGlyph",           "Colored",                 IgnoreType.Property); // manual
+        Ignore(ctx, "ImFontGlyph",           "Visible",                 IgnoreType.Property); // manual
+        Ignore(ctx, "ImFontGlyph",           "Codepoint",               IgnoreType.Property); // manual
+        Ignore(ctx, "ImGuiIO",               "MouseClickedPos",         IgnoreType.Property); // manual
+        Ignore(ctx, "ImGuiIO",               "MouseDragMaxDistanceAbs", IgnoreType.Property); // manual
+
+        Ignore(ctx, "ImGuiStyle",            "Colors",                  IgnoreType.Property); // manual
 
         Ignore(ctx, "ImNewWrapper", null, IgnoreType.Class); // unused
 

diff --git a/DearImGui.Generator/Passes/ImGuiSummaryPass.cs b/DearImGui.Generator/Passes/ImGuiSummaryPass.cs
@@ -12,5 +12,5 @@ public sealed class ImGuiSummaryPass : ImSummaryPass
             }
             .ToImmutableSortedSet();
 
-    protected override string HeaderUrl { get; } = @"https://github.com/ocornut/imgui/blob/9aae45eb4a05a5a1f96be1ef37eb503a12ceb889/imgui.h";
+    protected override string HeaderUrl { get; } = @"https://github.com/ocornut/imgui/blob/9cd9c2eff99877a3f10a7f9c2a3a5b9c15ea36c6/imgui.h";
 }
diff --git a/DearImGui.OpenTK/Extensions/GameWindowBaseWithDebugContext.cs b/DearImGui.OpenTK/Extensions/GameWindowBaseWithDebugContext.cs
@@ -68,6 +68,13 @@ private static void DebugProcCallback(
 
         var str = builder.ToString();
 
-        throw new InvalidOperationException(str);
+        if (severity == DebugSeverity.DebugSeverityNotification || severity == DebugSeverity.DebugSeverityLow)
+        {
+            Debug.WriteLine(str);
+        }
+        else
+        {
+            throw new InvalidOperationException(str);
+        }
     }
 }
diff --git a/DearImGui.OpenTK/ImGuiController.cs b/DearImGui.OpenTK/ImGuiController.cs
@@ -344,6 +344,7 @@ private void InitializeFlags()
         IO.BackendFlags |= ImGuiBackendFlags.HasMouseCursors;
 
         IO.ConfigFlags |= ImGuiConfigFlags.NavEnableKeyboard;
+        IO.ConfigFlags |= ImGuiConfigFlags.DockingEnable;
     }
 
     private unsafe void InitializeFont(string? fontPath, float? fontSize)