cleanup rlimgui a bit more

Signed-off-by: Tomas Slusny <[email protected]>

Author: deathbeam

src/Raylib.NET.ImGui/RlImGui.cs

@@ -23,9 +23,20 @@ public static class RlImGui
     internal static bool IsAltDown() => Raylib.IsKeyDown((int)KeyboardKey.KEY_LEFT_ALT) || Raylib.IsKeyDown((int)KeyboardKey.KEY_RIGHT_ALT);
     internal static bool IsSuperDown() => Raylib.IsKeyDown((int)KeyboardKey.KEY_LEFT_SUPER) || Raylib.IsKeyDown((int)KeyboardKey.KEY_RIGHT_SUPER);
 
-    public static void Setup(bool darkTheme = true, bool enableDocking = false)
+    public static void Setup(bool darkTheme = true, bool enableDocking = false, bool addDefaultFont = true)
     {
-        BeginInitImGui();
+        LastFrameFocused = Raylib.IsWindowFocused();
+        LastControlPressed = false;
+        LastShiftPressed = false;
+        LastAltPressed = false;
+        LastSuperPressed = false;
+
+        FontTexture.Id = 0;
+
+        SetupKeymap();
+        SetupMouseCursors();
+
+        ImGuiContext = ImGui.CreateContext();
 
         if (darkTheme)
             ImGui.StyleColorsDark();
@@ -35,22 +46,30 @@ public static void Setup(bool darkTheme = true, bool enableDocking = false)
         if (enableDocking)
             ImGui.GetIO().ConfigFlags |= ImGuiConfigFlags.DockingEnable;
 
-        EndInitImGui();
-    }
+        ImGui.SetCurrentContext(ImGuiContext);
 
-    public static void BeginInitImGui()
-    {
-        LastFrameFocused = Raylib.IsWindowFocused();
-        LastControlPressed = false;
-        LastShiftPressed = false;
-        LastAltPressed = false;
-        LastSuperPressed = false;
+        var fonts = ImGui.GetIO().Fonts;
+        var io = ImGui.GetIO();
+        var platformIO = ImGui.GetPlatformIO();
 
-        FontTexture.Id = 0;
+        if (addDefaultFont)
+            fonts.AddFontDefault();
 
-        SetupKeymap();
+        io.BackendFlags |= ImGuiBackendFlags.HasMouseCursors | ImGuiBackendFlags.HasSetMousePos | ImGuiBackendFlags.HasGamepad;
+        io.MousePos.X = 0;
+        io.MousePos.Y = 0;
 
-        ImGuiContext = ImGui.CreateContext();
+        unsafe
+        {
+            SetClipCallback = new SetClipTextCallback(rlImGuiSetClipText);
+            platformIO.Platform_SetClipboardTextFn = Marshal.GetFunctionPointerForDelegate(SetClipCallback);
+
+            GetClipCallback = new GetClipTextCallback(rImGuiGetClipText);
+            platformIO.Platform_GetClipboardTextFn = Marshal.GetFunctionPointerForDelegate(GetClipCallback);
+        }
+
+        platformIO.Platform_ClipboardUserData = IntPtr.Zero;
+        ReloadFonts();
     }
 
     private static void SetupKeymap()
@@ -185,7 +204,7 @@ private static void SetupMouseCursors()
     public static unsafe void ReloadFonts()
     {
         ImGui.SetCurrentContext(ImGuiContext);
-        ImGuiIOPtr io = ImGui.GetIO();
+        var io = ImGui.GetIO();
 
         io.Fonts.GetTexDataAsRGBA32(
                 out byte* pixels,
@@ -194,7 +213,7 @@ public static unsafe void ReloadFonts()
                 out int bytesPerPixel
         );
 
-        Image image = new()
+        var image = new Image()
         {
             Data = pixels,
             Width = width,
@@ -207,7 +226,6 @@ out int bytesPerPixel
             Raylib.UnloadTexture(FontTexture);
 
         FontTexture = Raylib.LoadTextureFromImage(image);
-
         io.Fonts.SetTexID(new IntPtr(FontTexture.Id));
     }
 
@@ -227,35 +245,6 @@ unsafe internal static void rlImGuiSetClipText(IntPtr userData, sbyte* text)
     private static GetClipTextCallback? GetClipCallback;
     private static SetClipTextCallback? SetClipCallback;
 
-    public static void EndInitImGui()
-    {
-        SetupMouseCursors();
-
-        ImGui.SetCurrentContext(ImGuiContext);
-
-        var fonts = ImGui.GetIO().Fonts;
-        fonts.AddFontDefault();
-
-        ImGuiIOPtr io = ImGui.GetIO();
-        ImGuiPlatformIOPtr platformIO = ImGui.GetPlatformIO();
-
-        io.BackendFlags |= ImGuiBackendFlags.HasMouseCursors | ImGuiBackendFlags.HasSetMousePos | ImGuiBackendFlags.HasGamepad;
-        io.MousePos.X = 0;
-        io.MousePos.Y = 0;
-
-        unsafe
-        {
-            SetClipCallback = new SetClipTextCallback(rlImGuiSetClipText);
-            platformIO.Platform_SetClipboardTextFn = Marshal.GetFunctionPointerForDelegate(SetClipCallback);
-
-            GetClipCallback = new GetClipTextCallback(rImGuiGetClipText);
-            platformIO.Platform_GetClipboardTextFn = Marshal.GetFunctionPointerForDelegate(GetClipCallback);
-        }
-
-        platformIO.Platform_ClipboardUserData = IntPtr.Zero;
-        ReloadFonts();
-    }
-
     private static void SetMouseEvent(ImGuiIOPtr io, int rayMouse, ImGuiMouseButton imGuiMouse)
     {
         if (Raylib.IsMouseButtonPressed(rayMouse))