muffin v7.5.0

This commit is contained in:
alydev 2026-05-01 05:17:35 +10:00
parent afafd5e377
commit a6481e7b9a
67 changed files with 4281 additions and 2372 deletions

View file

@ -1,4 +1,3 @@
using System.Runtime.CompilerServices;
using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Windowing;
@ -33,39 +32,15 @@ public abstract class LWindow : Window
}
}
protected new bool IsPinned
{
get
{
return InternalIsPinned(this);
}
set
{
InternalIsPinned(this) = value;
}
}
protected new bool IsClickthrough
{
get
{
return InternalIsClickthrough(this);
}
set
{
InternalIsClickthrough(this) = value;
}
}
protected int? Alpha
{
get
{
return (int?)(100000f * InternalAlpha(this));
return (int?)(100000f * base.BgAlpha);
}
set
{
InternalAlpha(this) = (float?)value / 100000f;
base.BgAlpha = (float?)value / 100000f;
}
}
@ -85,11 +60,11 @@ public abstract class LWindow : Window
{
if (base.AllowPinning)
{
IsPinned = windowConfig.IsPinned;
base.IsPinned = windowConfig.IsPinned;
}
if (base.AllowClickthrough)
{
IsClickthrough = windowConfig.IsClickthrough;
base.IsClickthrough = windowConfig.IsClickthrough;
}
Alpha = windowConfig.Alpha;
}
@ -106,14 +81,14 @@ public abstract class LWindow : Window
if (windowConfig != null)
{
bool flag = false;
if (base.AllowPinning && windowConfig.IsPinned != IsPinned)
if (base.AllowPinning && windowConfig.IsPinned != base.IsPinned)
{
windowConfig.IsPinned = IsPinned;
windowConfig.IsPinned = base.IsPinned;
flag = true;
}
if (base.AllowClickthrough && windowConfig.IsClickthrough != IsClickthrough)
if (base.AllowClickthrough && windowConfig.IsClickthrough != base.IsClickthrough)
{
windowConfig.IsClickthrough = IsClickthrough;
windowConfig.IsClickthrough = base.IsClickthrough;
flag = true;
}
if (windowConfig.Alpha != Alpha)
@ -176,13 +151,4 @@ public abstract class LWindow : Window
UpdateWindowConfig();
}
}
[UnsafeAccessor(UnsafeAccessorKind.Field, Name = "internalIsPinned")]
private static extern ref bool InternalIsPinned(Window @this);
[UnsafeAccessor(UnsafeAccessorKind.Field, Name = "internalIsClickthrough")]
private static extern ref bool InternalIsClickthrough(Window @this);
[UnsafeAccessor(UnsafeAccessorKind.Field, Name = "internalAlpha")]
private static extern ref float? InternalAlpha(Window @this);
}