no need to connect context

vvvv · Sep 21, 2022 · d470f5b · d470f5b
1 parent d891b1f
commit d470f5b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/src/VL.ImGui.Generator/SourceGenerator.cs b/src/VL.ImGui.Generator/SourceGenerator.cs
@@ -120,7 +120,7 @@ private static string CreateSource(SourceProductionContext context, ClassDeclara
                     nodeDecl = "return c.Node(inputs, outputs);";
                     break;
                 case Mode.ImmediateMode:
-                    nodeDecl = "return c.Node(inputs, outputs, () => { if (ctx != null) s.Update(ctx); });";
+                    nodeDecl = "return c.Node(inputs, outputs, () => { s.Update(ctx); });";
                     break;
                 default:
                     break;

diff --git a/src/VL.ImGui/Core/Context.cs b/src/VL.ImGui/Core/Context.cs
@@ -6,11 +6,20 @@ namespace VL.ImGui
 {
     using ImGui = ImGuiNET.ImGui;
 
+    public static class ContextHelpers
+    {        
+        public static Context Validate(this Context c) => c ?? Context.Current;
+    }
+
+
     public class Context : IDisposable
     {
         private readonly IntPtr _context;
         private readonly List<Widget> _widgetsToReset = new List<Widget>();
 
+        [ThreadStatic]
+        internal static Context Current;
+
         public Context()
         {
             _context = ImGui.CreateContext();
@@ -32,6 +41,7 @@ public virtual void NewFrame()
 
         public Frame MakeCurrent()
         {
+            Current = this;
             return new Frame(_context);
         }
 

diff --git a/src/VL.ImGui/Core/Widget.cs b/src/VL.ImGui/Core/Widget.cs
@@ -13,14 +13,18 @@ internal virtual void Reset() { }
 
         internal void Update(Context context)
         {
-            try
+            context = context.Validate();
+            if (context != null)
             {
-                Style?.Set();
-                UpdateCore(context);
-            }
-            finally
-            {
-                Style?.Reset();
+                try
+                {
+                    Style?.Set();
+                    UpdateCore(context);
+                }
+                finally
+                {
+                    Style?.Reset();
+                }
             }
         }
     }