From 276a54026cad702c32564ebfc02aa12d034e5822 Mon Sep 17 00:00:00 2001
From: JacobTech <jacob@jacobtech.com>
Date: Sun, 24 Nov 2024 14:08:32 -0500
Subject: [PATCH] Pre Clean

---
 GraphicsManager/GraphicsManager.csproj      |  4 ++--
 GraphicsManager/Interfaces/IRenderObject.cs |  2 ++
 GraphicsManager/Objects/Core/LabelBase.cs   |  2 ++
 GraphicsManager/Objects/Core/Texture.cs     | 10 ++++++++--
 GraphicsManager/Objects/Rectangle.cs        |  2 ++
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/GraphicsManager/GraphicsManager.csproj b/GraphicsManager/GraphicsManager.csproj
index abd5d9d..f631e3b 100644
--- a/GraphicsManager/GraphicsManager.csproj
+++ b/GraphicsManager/GraphicsManager.csproj
@@ -10,7 +10,7 @@
         <IncludeSymbols>False</IncludeSymbols>
         <RepositoryUrl>https://git.jacobtech.com/JacobTech.com/GraphicsManager</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
-        <Version>1.1.1-alpha35</Version>
+        <Version>1.1.1-alpha36</Version>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -34,7 +34,7 @@
 
     <ItemGroup>
         <PackageReference Include="OpenTK" Version="4.8.2" />
-        <PackageReference Include="SixLabors.ImageSharp" Version="2.1.7" />
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
         <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta15" />
         <PackageReference Include="SpaceWizards.SharpFont" Version="1.0.1" />
     </ItemGroup>
diff --git a/GraphicsManager/Interfaces/IRenderObject.cs b/GraphicsManager/Interfaces/IRenderObject.cs
index 2c9c5c1..eced5aa 100755
--- a/GraphicsManager/Interfaces/IRenderObject.cs
+++ b/GraphicsManager/Interfaces/IRenderObject.cs
@@ -13,6 +13,8 @@ public interface IRenderObject
 	public void ForceDistanceUpdate(IParent parent);
 	public BetterContextMenu? ContextMenu { get; set; }
 	public ObjectAnchor Anchor { get; set; }
+	
+	public Vector4i Margins { get; set; }
 	public bool MouseInside { get; set; }
 	public bool IgnoreHover { get; set; }
 	public bool BlockDraw { get; set; }
diff --git a/GraphicsManager/Objects/Core/LabelBase.cs b/GraphicsManager/Objects/Core/LabelBase.cs
index de45ac2..479a5a0 100644
--- a/GraphicsManager/Objects/Core/LabelBase.cs
+++ b/GraphicsManager/Objects/Core/LabelBase.cs
@@ -398,6 +398,8 @@ public class LabelBase : ILabel
 		Loaded = false;
 		Visible = false;
 	}
+	
+	public Vector4i Margins { get; set; } = new();
 
 	public event Func<IRenderObject, Task>? SizeChanged; 
 	
diff --git a/GraphicsManager/Objects/Core/Texture.cs b/GraphicsManager/Objects/Core/Texture.cs
index f64ef6c..671c2b5 100755
--- a/GraphicsManager/Objects/Core/Texture.cs
+++ b/GraphicsManager/Objects/Core/Texture.cs
@@ -3,6 +3,7 @@ using OpenTK.Mathematics;
 using OpenTK.Windowing.Desktop;
 using SharpFont;
 using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Formats.Bmp;
 using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.Formats.Jpeg;
@@ -45,6 +46,11 @@ public class Texture
 		PreferContiguousImageBuffers = true
 	};
 
+	private static DecoderOptions NewCFG = new DecoderOptions()
+	{
+		Configuration = imgcfg,
+	};
+
 	public int handel;
 	public Vector2i? RawSize = null;
 	public int Location { get; set; } = 1;
@@ -79,7 +85,7 @@ public class Texture
 	{
 		try
 		{
-			Image<Rgba32> image = Image.Load<Rgba32>(imgcfg, File);
+			Image<Rgba32> image = Image.Load<Rgba32>(NewCFG, File);
 			image.Mutate(x =>
 			{
 				x.Flip(FlipMode.Vertical);
@@ -102,7 +108,7 @@ public class Texture
 	{
 		try
 		{
-			Image<Rgba32> image = Image.Load<Rgba32>(imgcfg, File);
+			Image<Rgba32> image = Image.Load<Rgba32>(NewCFG, File);
 			image.Mutate(x =>
 			{
 				x.Flip(FlipMode.Vertical);
diff --git a/GraphicsManager/Objects/Rectangle.cs b/GraphicsManager/Objects/Rectangle.cs
index 766262b..a9ce30b 100755
--- a/GraphicsManager/Objects/Rectangle.cs
+++ b/GraphicsManager/Objects/Rectangle.cs
@@ -126,6 +126,8 @@ public class Rectangle : ITextureObject
 	{
 		DrawBase();
 	}
+
+	public Vector4i Margins { get; set; } = new();
 	
 	public virtual MouseCursor HoverMouse { get; set; } = MouseCursor.Default;
 	public List<SubHitBox> SubHitBoxes { get; } = new();