Pre Clean

This commit is contained in:
JacobTech 2024-11-24 14:08:32 -05:00
parent a1e3d4cf12
commit 276a54026c
5 changed files with 16 additions and 4 deletions

View File

@ -10,7 +10,7 @@
<IncludeSymbols>False</IncludeSymbols> <IncludeSymbols>False</IncludeSymbols>
<RepositoryUrl>https://git.jacobtech.com/JacobTech.com/GraphicsManager</RepositoryUrl> <RepositoryUrl>https://git.jacobtech.com/JacobTech.com/GraphicsManager</RepositoryUrl>
<RepositoryType>git</RepositoryType> <RepositoryType>git</RepositoryType>
<Version>1.1.1-alpha35</Version> <Version>1.1.1-alpha36</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@ -34,7 +34,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="OpenTK" Version="4.8.2" /> <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="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta15" />
<PackageReference Include="SpaceWizards.SharpFont" Version="1.0.1" /> <PackageReference Include="SpaceWizards.SharpFont" Version="1.0.1" />
</ItemGroup> </ItemGroup>

View File

@ -13,6 +13,8 @@ public interface IRenderObject
public void ForceDistanceUpdate(IParent parent); public void ForceDistanceUpdate(IParent parent);
public BetterContextMenu? ContextMenu { get; set; } public BetterContextMenu? ContextMenu { get; set; }
public ObjectAnchor Anchor { get; set; } public ObjectAnchor Anchor { get; set; }
public Vector4i Margins { get; set; }
public bool MouseInside { get; set; } public bool MouseInside { get; set; }
public bool IgnoreHover { get; set; } public bool IgnoreHover { get; set; }
public bool BlockDraw { get; set; } public bool BlockDraw { get; set; }

View File

@ -398,6 +398,8 @@ public class LabelBase : ILabel
Loaded = false; Loaded = false;
Visible = false; Visible = false;
} }
public Vector4i Margins { get; set; } = new();
public event Func<IRenderObject, Task>? SizeChanged; public event Func<IRenderObject, Task>? SizeChanged;

View File

@ -3,6 +3,7 @@ using OpenTK.Mathematics;
using OpenTK.Windowing.Desktop; using OpenTK.Windowing.Desktop;
using SharpFont; using SharpFont;
using SixLabors.ImageSharp; using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.Formats.Bmp; using SixLabors.ImageSharp.Formats.Bmp;
using SixLabors.ImageSharp.Formats.Gif; using SixLabors.ImageSharp.Formats.Gif;
using SixLabors.ImageSharp.Formats.Jpeg; using SixLabors.ImageSharp.Formats.Jpeg;
@ -45,6 +46,11 @@ public class Texture
PreferContiguousImageBuffers = true PreferContiguousImageBuffers = true
}; };
private static DecoderOptions NewCFG = new DecoderOptions()
{
Configuration = imgcfg,
};
public int handel; public int handel;
public Vector2i? RawSize = null; public Vector2i? RawSize = null;
public int Location { get; set; } = 1; public int Location { get; set; } = 1;
@ -79,7 +85,7 @@ public class Texture
{ {
try try
{ {
Image<Rgba32> image = Image.Load<Rgba32>(imgcfg, File); Image<Rgba32> image = Image.Load<Rgba32>(NewCFG, File);
image.Mutate(x => image.Mutate(x =>
{ {
x.Flip(FlipMode.Vertical); x.Flip(FlipMode.Vertical);
@ -102,7 +108,7 @@ public class Texture
{ {
try try
{ {
Image<Rgba32> image = Image.Load<Rgba32>(imgcfg, File); Image<Rgba32> image = Image.Load<Rgba32>(NewCFG, File);
image.Mutate(x => image.Mutate(x =>
{ {
x.Flip(FlipMode.Vertical); x.Flip(FlipMode.Vertical);

View File

@ -126,6 +126,8 @@ public class Rectangle : ITextureObject
{ {
DrawBase(); DrawBase();
} }
public Vector4i Margins { get; set; } = new();
public virtual MouseCursor HoverMouse { get; set; } = MouseCursor.Default; public virtual MouseCursor HoverMouse { get; set; } = MouseCursor.Default;
public List<SubHitBox> SubHitBoxes { get; } = new(); public List<SubHitBox> SubHitBoxes { get; } = new();