Merge branch 'main' into dependabot/nuget/MSTest.TestAdapter-3.6.0

.github/dependabot.yml

@@ -4,5 +4,3 @@ updates:
   directory: "/"
   schedule:
     interval: "daily"
-  assignees:
-      - "matt-edmondson"

.github/workflows/dependabot-merge.yml

@@ -16,7 +16,7 @@ jobs:
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Enable auto-merge for Dependabot PRs
-        if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
+        if: steps.metadata.outputs.update-type == 'version-update:semver-major'
         run: gh pr merge --auto --merge "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}

.github/workflows/dotnet.yml

@@ -1,16 +1,16 @@
-name: Build and Analyze
+name: Build and Test
 
 on:
   push:
     branches: [ "main" ]
   pull_request:
-    types: [opened, synchronize, reopened]
+    types: [opened, synchronize, reopened, closed]
 
 permissions:
   packages: write
   contents: write
 
 jobs:
   build-dotnet-library:
-    uses: ktsu-io/workflows/.github/workflows/build-dotnet-library.yml@main
+    uses: ktsu-dev/workflows/.github/workflows/build-dotnet-library.yml@main
     secrets: inherit

AUTHORS

@@ -1 +1 @@
-ktsu.io
+ktsu

Directory.Build.targets

@@ -89,7 +89,7 @@
     <PackageReference Include="coverlet.collector" Version="6.0.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
   </ItemGroup>
 
 </Project>

ImGuiApp/ForceDpiAware.cs

@@ -1,7 +1,7 @@
 // Adapted From: https://github.com/Ryujinx/Ryujinx/blob/master/src/Ryujinx.Common/SystemInterop/ForceDpiAware.cs
 // License: MIT
 
-namespace ktsu.io.ImGuiApp;
+namespace ktsu.ImGuiApp;
 
 using System.Globalization;
 using System.Runtime.InteropServices;

ImGuiApp/GdiPlusHelper.cs

@@ -1,7 +1,7 @@
 // Adapted From: https://github.com/Ryujinx/Ryujinx/blob/master/src/Ryujinx.Common/SystemInterop/GdiPlusHelper.cs
 // License: MIT
 
-namespace ktsu.io.ImGuiApp;
+namespace ktsu.ImGuiApp;
 
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;

ImGuiApp/ImGuiApp.cs

@@ -1,14 +1,15 @@
 // Ignore Spelling: App Im
 
-namespace ktsu.io.ImGuiApp;
+namespace ktsu.ImGuiApp;
 
 using System.Collections.Concurrent;
 using System.Collections.ObjectModel;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using ImGuiNET;
-using ktsu.io.StrongPaths;
+using ktsu.Extensions;
+using ktsu.StrongPaths;
 using Silk.NET.Input;
 using Silk.NET.OpenGL;
 using Silk.NET.OpenGL.Extensions.ImGui;
@@ -47,6 +48,7 @@ public static ImGuiAppWindowState WindowState
 
 	private static int[] FontSizes { get; } = [12, 13, 14, 16, 18, 20, 24, 28, 32, 40, 48];
 	private static Dictionary<int, ImFontPtr> Fonts { get; } = [];
+	private static Collection<nint> FontDataPtrs { get; } = [];
 
 	public static bool IsFocused { get; private set; } = true;
 	public static bool IsVisible => (window?.WindowState != Silk.NET.Windowing.WindowState.Minimized) && (window?.IsVisible ?? false);
@@ -254,6 +256,9 @@ public static void Start(AppConfig config)
 		{
 			lock (LockGL)
 			{
+				// Free the natively allocated font data
+				FontDataPtrs.ForEach(p => Marshal.FreeHGlobal(p));
+
 				// Dispose our controller first
 				controller?.Dispose();
 
@@ -457,6 +462,7 @@ internal static void InitFonts()
 		var io = ImGui.GetIO();
 		var fontAtlasPtr = io.Fonts;
 		nint fontBytesPtr = Marshal.AllocHGlobal(fontBytes.Length);
+		FontDataPtrs.Add(fontBytesPtr);
 		Marshal.Copy(fontBytes, 0, fontBytesPtr, fontBytes.Length);
 		_ = fontAtlasPtr.AddFontDefault();
 		foreach (int size in FontSizes)
@@ -469,6 +475,7 @@ internal static void InitFonts()
 					OversampleH = 2,
 					OversampleV = 2,
 					PixelSnapH = true,
+					FontDataOwnedByAtlas = false,
 				};
 				_ = fontAtlasPtr.AddFontFromMemoryTTF(fontBytesPtr, fontBytes.Length, size, fontConfig, fontAtlasPtr.GetGlyphRangesDefault());
 			}

ImGuiApp/ImGuiApp.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ktsu.io.ScopedAction" Version="1.0.0-alpha.4" />
-    <PackageReference Include="ktsu.io.StrongPaths" Version="1.1.1" />
+    <PackageReference Include="ktsu.ScopedAction" Version="1.0.0-alpha.5" />
+    <PackageReference Include="ktsu.StrongPaths" Version="1.1.3" />
     <PackageReference Include="Silk.NET" Version="2.21.0" />
     <PackageReference Include="Silk.NET.OpenGL.Extensions.ImGui" Version="2.21.0" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />

ImGuiApp/UIScaler.cs

@@ -1,6 +1,6 @@
-namespace ktsu.io.ImGuiApp;
+namespace ktsu.ImGuiApp;
 
-using ktsu.io.ScopedAction;
+using ktsu.ScopedAction;
 using ImGuiNET;
 using System.Numerics;
 

ImGuiAppDemo/ImGuiAppDemo.cs

@@ -1,11 +1,11 @@
 // Ignore Spelling: App Im
 
-namespace ktsu.io.ImGuiApp.Demo;
+namespace ktsu.ImGuiApp.Demo;
 
 using System.Runtime.InteropServices;
 using ImGuiNET;
-using ktsu.io.ImGuiApp;
-using ktsu.io.ImGuiApp.Demo.Properties;
+using ktsu.ImGuiApp;
+using ktsu.ImGuiApp.Demo.Properties;
 
 internal static class ImGuiAppDemo
 {

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023-2024 ktsu.io
+Copyright (c) 2023-2024 ktsu.dev
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -4,10 +4,10 @@ A bootstrap library to give you an environment to build an ImGUI.NET application
 
 ## Minimal Example
 ```csharp
-namespace ktsu.io.ImGuiAppDemo;
+namespace ktsu.ImGuiAppDemo;
 
 using ImGuiNET;
-using ktsu.io.ImGuiApp;
+using ktsu.ImGuiApp;
 
 internal class ImGuiAppDemo
 {

VERSION

@@ -1 +1 @@
-1.0.0-alpha.33
+1.0.0-alpha.36