ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-14 20:54:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Improve fade-in, use delta time, draw fade-out texture on fake window to preserve focus order

Browse source
This commit is contained in:
goaaats 2025-05-10 13:08:24 +02:00
parent b4e62571a6
commit 9afece8679
1 changed files with 42 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

54
Dalamud/Interface/Windowing/Window.cs
View file

@ -16,6 +16,7 @@ using Dalamud.Interface.Textures.Internal;
using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Textures.TextureWraps;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Internal; using Dalamud.Interface.Utility.Internal;
using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing.Persistence; using Dalamud.Interface.Windowing.Persistence;
using Dalamud.Logging.Internal; using Dalamud.Logging.Internal;
@ -32,8 +33,7 @@ namespace Dalamud.Interface.Windowing;
/// </summary> /// </summary>
public abstract class Window public abstract class Window
{ {
private const float FadeInOutTime = 1f; private const float FadeInOutTime = 0.08f;
private const float FadeInOutStep = 0.09f;
private static readonly ModuleLog Log = new("WindowSystem"); private static readonly ModuleLog Log = new("WindowSystem");
@ -51,6 +51,7 @@ public abstract class Window
private PresetModel.PresetWindow? presetWindow; private PresetModel.PresetWindow? presetWindow;
private bool presetDirty = false; private bool presetDirty = false;
private bool pushedFadeInAlpha = false;
private float fadeInTimer = 1f; private float fadeInTimer = 1f;
private float fadeOutTimer = 0f; private float fadeOutTimer = 0f;
private IDrawListTextureWrap? fadeOutTexture = null; private IDrawListTextureWrap? fadeOutTexture = null;
@ -347,7 +348,7 @@ public abstract class Window
if (this.fadeOutTexture != null) if (this.fadeOutTexture != null)
{ {
this.fadeOutTimer -= FadeInOutStep; this.fadeOutTimer -= ImGui.GetIO().DeltaTime;
if (this.fadeOutTimer <= 0f) if (this.fadeOutTimer <= 0f)
{ {
this.fadeOutTexture.Dispose(); this.fadeOutTexture.Dispose();
@ -355,14 +356,7 @@ public abstract class Window
} }
else else
{ {
var dl = ImGui.GetBackgroundDrawList(); this.DrawFakeFadeOutWindow();
dl.AddImage(
this.fadeOutTexture.ImGuiHandle,
this.fadeOutOrigin,
this.fadeOutOrigin + this.fadeOutSize,
Vector2.Zero,
Vector2.One,
ImGui.ColorConvertFloat4ToU32(new(1f, 1f, 1f, Math.Clamp(this.fadeOutTimer / FadeInOutTime, 0f, 1f))));
} }
} }
@ -370,7 +364,7 @@ public abstract class Window
return; return;
} }
this.fadeInTimer += FadeInOutStep; this.fadeInTimer += ImGui.GetIO().DeltaTime;
if (this.fadeInTimer > FadeInOutTime) if (this.fadeInTimer > FadeInOutTime)
this.fadeInTimer = FadeInOutTime; this.fadeInTimer = FadeInOutTime;
@ -592,6 +586,12 @@ public abstract class Window
ImGui.End(); ImGui.End();
if (this.pushedFadeInAlpha)
{
ImGui.PopStyleVar();
this.pushedFadeInAlpha = false;
}
if (!this.internalIsOpen && this.fadeOutTexture == null && !isReducedMotion) if (!this.internalIsOpen && this.fadeOutTexture == null && !isReducedMotion)
{ {
this.fadeOutTexture = Service<TextureManager>.Get().CreateDrawListTexture( this.fadeOutTexture = Service<TextureManager>.Get().CreateDrawListTexture(
@ -653,6 +653,8 @@ public abstract class Window
maxBgAlpha = maxBgAlpha.HasValue ? maxBgAlpha = maxBgAlpha.HasValue ?
Math.Clamp(maxBgAlpha.Value * fadeInAlpha, 0f, 1f) : Math.Clamp(maxBgAlpha.Value * fadeInAlpha, 0f, 1f) :
(*ImGui.GetStyleColorVec4(ImGuiCol.WindowBg)).W * fadeInAlpha; (*ImGui.GetStyleColorVec4(ImGuiCol.WindowBg)).W * fadeInAlpha;
ImGui.PushStyleVar(ImGuiStyleVar.Alpha, ImGui.GetStyle().Alpha * fadeInAlpha);
this.pushedFadeInAlpha = true;
} }
if (maxBgAlpha.HasValue) if (maxBgAlpha.HasValue)
@ -805,6 +807,34 @@ public abstract class Window
ImGui.PopClipRect(); ImGui.PopClipRect();
} }
private void DrawFakeFadeOutWindow()
{
// Draw a fake window to fade out, so that the fade out texture stays in the right place in the
// focus order
ImGui.SetNextWindowPos(this.fadeOutOrigin);
ImGui.SetNextWindowSize(this.fadeOutSize);
using var style = ImRaii.PushStyle(ImGuiStyleVar.WindowPadding, Vector2.Zero);
style.Push(ImGuiStyleVar.WindowBorderSize, 0);
style.Push(ImGuiStyleVar.FrameBorderSize, 0);
var fakeFlags = ImGuiWindowFlags.NoInputs | ImGuiWindowFlags.NoNav | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoScrollWithMouse | ImGuiWindowFlags.NoMouseInputs |
ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoBackground;
if (ImGui.Begin(this.WindowName, fakeFlags))
{
var dl = ImGui.GetWindowDrawList();
dl.AddImage(
this.fadeOutTexture!.ImGuiHandle,
this.fadeOutOrigin,
this.fadeOutOrigin + this.fadeOutSize,
Vector2.Zero,
Vector2.One,
ImGui.ColorConvertFloat4ToU32(new(1f, 1f, 1f, Math.Clamp(this.fadeOutTimer / FadeInOutTime, 0f, 1f))));
}
ImGui.End();
}
/// <summary> /// <summary>
/// Structure detailing the size constraints of a window. /// Structure detailing the size constraints of a window.
/// </summary> /// </summary>