Fix showing large images;

Update to 1.3.8;
FanTranslatorsInternational · Feb 8, 2025 · 90bdf86 · 90bdf86
1 parent 26ee31f
commit 90bdf86
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/ImGui.Forms/Controls/Base/Component.cs b/ImGui.Forms/Controls/Base/Component.cs
@@ -69,7 +69,7 @@ public void Update(Rectangle contentRect)
 
             // Draw border
             if (ShowBorder)
-                ImGuiNET.ImGui.GetWindowDrawList().AddRect(contentRect.Position, contentRect.Position + contentRect.Size, ImGuiNET.ImGui.GetColorU32(ImGuiCol.Border), 0);
+                ImGuiNET.ImGui.GetWindowDrawList().AddRect(contentRect.Position, contentRect.Position + contentRect.Size, ImGuiNET.ImGui.GetColorU32(ImGuiCol.Border));
 
             ApplyStyles();
             UpdateInternal(contentRect);

diff --git a/ImGui.Forms/Controls/ZoomablePictureBox.cs b/ImGui.Forms/Controls/ZoomablePictureBox.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Numerics;
 using ImGui.Forms.Controls.Base;
+using ImGui.Forms.Extensions;
 using ImGui.Forms.Models;
 using ImGui.Forms.Resources;
-using ImGui.Forms.Support;
 using ImGuiNET;
 
 namespace ImGui.Forms.Controls
@@ -31,6 +31,8 @@ public ThemedImageResource Image
 
         public Size Size { get; set; } = Size.Parent;
 
+        public bool ShowImageBorder { get; set; }
+
         #endregion
 
         #region Events
@@ -56,7 +58,7 @@ protected override void UpdateInternal(Veldrid.Rectangle contentRect)
         {
             if (Image == null || (nint)_baseImg == nint.Zero)
                 return;
-            
+
             ImGuiNET.ImGui.Dummy(contentRect.Size);
 
             var componentCenterPosition = contentRect.Position + contentRect.Size / 2;
@@ -104,6 +106,8 @@ protected override void UpdateInternal(Veldrid.Rectangle contentRect)
             var absoluteContentEndPosition = absoluteContentPosition + scaledContentSize;
 
             ImGuiNET.ImGui.GetWindowDrawList().AddImage((nint)_baseImg, absoluteContentPosition, absoluteContentEndPosition);
+            if (ShowImageBorder)
+                ImGuiNET.ImGui.GetWindowDrawList().AddRect(absoluteContentPosition, absoluteContentEndPosition, Style.GetColor(ImGuiCol.Border).ToUInt32());
         }
 
         private void OnMouseScrolled()

diff --git a/ImGui.Forms/Factories/ImageFactory.cs b/ImGui.Forms/Factories/ImageFactory.cs
@@ -86,12 +86,12 @@ private nint LoadImageInternal(Image<Rgba32> image)
 
         private unsafe void CopyImageData(Texture texture, Image<Rgba32> image)
         {
-            if (!image.DangerousTryGetSinglePixelMemory(out Memory<Rgba32> data))
-                return;
+            var copiedImage = new Rgba32[image.Width * image.Height];
+            image.CopyPixelDataTo(copiedImage);
 
             int size = image.Width * image.Height * 4;
 
-            fixed (Rgba32* imgData = data.Span)
+            fixed (Rgba32* imgData = copiedImage)
                 _gd.UpdateTexture(texture, (nint)imgData, (uint)size, 0, 0, 0, (uint)image.Width, (uint)image.Height, 1, 0, 0);
         }
 

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.3.7</version>
+    <version>1.3.8</version>
     <description>A WinForms-inspired object-oriented framework around Dear ImGui (https://github.com/ocornut/imgui)</description>
 
     <authors>onepiecefreak</authors>