Add ImageResource.FromResource without assembly;

Bump to 1.1.8;
FanTranslatorsInternational · Oct 3, 2024 · 026dc7e · 026dc7e
1 parent fd4d480
commit 026dc7e
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
diff --git a/ImGui.Forms/Controls/Button.cs b/ImGui.Forms/Controls/Button.cs
@@ -90,9 +90,8 @@ private void ApplyStyles(bool enabled, FontResource font)
         private void RemoveStyles(bool enabled, FontResource font)
         {
             ImGuiNET.ImGui.PopStyleVar();
-
-            ImFontPtr? fontPtr = font?.GetPointer();
-            if (fontPtr != null)
+
+            if (Font?.GetPointer() != null)
                 ImGuiNET.ImGui.PopFont();
 
             if (!enabled)

diff --git a/ImGui.Forms/Controls/Label.cs b/ImGui.Forms/Controls/Label.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Drawing;
 using System.Numerics;
 using ImGui.Forms.Controls.Base;
 using ImGui.Forms.Localization;
@@ -83,8 +82,7 @@ protected override void ApplyStyles()
 
         protected override void RemoveStyles()
         {
-            ImFontPtr? fontPtr = Font?.GetPointer();
-            if (fontPtr != null)
+            if (Font?.GetPointer() != null)
                 ImGuiNET.ImGui.PopFont();
 
             if (!TextColor.IsEmpty)

diff --git a/ImGui.Forms/Controls/Menu/MenuBar.cs b/ImGui.Forms/Controls/Menu/MenuBar.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using ImGui.Forms.Resources;
 using ImGuiNET;
-using static System.Net.Mime.MediaTypeNames;
 
 namespace ImGui.Forms.Controls.Menu
 {

diff --git a/ImGui.Forms/Controls/ProgressBar.cs b/ImGui.Forms/Controls/ProgressBar.cs
@@ -64,8 +64,7 @@ protected override void ApplyStyles()
 
         protected override void RemoveStyles()
         {
-            ImFontPtr? fontPtr = Font?.GetPointer();
-            if (fontPtr != null)
+            if (Font?.GetPointer() != null)
                 ImGuiNET.ImGui.PopFont();
         }
     }

diff --git a/ImGui.Forms/Controls/TextBox.cs b/ImGui.Forms/Controls/TextBox.cs
@@ -155,9 +155,8 @@ protected override void ApplyStyles()
         protected override void RemoveStyles()
         {
             ImGuiNET.ImGui.PopStyleVar();
-
-            ImFontPtr? fontPtr = Font?.GetPointer();
-            if (fontPtr != null)
+
+            if (Font?.GetPointer() != null)
                 ImGuiNET.ImGui.PopFont();
         }
 

diff --git a/ImGui.Forms/ImGui.Forms.nuspec b/ImGui.Forms/ImGui.Forms.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Imgui.Forms</id>
-    <version>1.1.7</version>
+    <version>1.1.8</version>
     <description>A WinForms-inspired object-oriented framework around Dear ImGui (https://github.com/ocornut/imgui)</description>
 
     <authors>onepiecefreak</authors>

diff --git a/ImGui.Forms/Resources/ImageResource.cs b/ImGui.Forms/Resources/ImageResource.cs
@@ -52,6 +52,17 @@ public static ImageResource FromFile(string path)
             return FromImage(Image.Load<Rgba32>(path));
         }
 
+        /// <summary>
+        /// Creates a new <see cref="ImageResource"/> from an embedded resource <paramref name="resourceName"/> in <see cref="Assembly.GetCallingAssembly"/>.
+        /// </summary>
+        /// <param name="resourceName">The name of the resource to load.</param>
+        /// <returns>An <see cref="ImageResource"/> representing the image.</returns>
+        /// <remarks>To load built-in images, see <see cref="ImageResources"/>.</remarks>
+        public static ImageResource FromResource(string resourceName)
+        {
+            return FromResource(Assembly.GetCallingAssembly(), resourceName);
+        }
+
         /// <summary>
         /// Creates a new <see cref="ImageResource"/> from an embedded resource <paramref name="resourceName"/> in <paramref name="assembly"/>.
         /// </summary>