ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Don't fade windows if we are docked or collapsed, for now

Browse source 
The proper fix would be not to use the "fake window" approach and insert a drawlist, but not with the current bindings
This commit is contained in:
goaaats 2025-05-31 13:20:54 +02:00
parent abde79dbc8
commit a2f6fb85e5
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -598,6 +598,8 @@ public abstract class Window
this.fadeOutSize = ImGui.GetWindowSize(); this.fadeOutSize = ImGui.GetWindowSize();
this.fadeOutOrigin = ImGui.GetWindowPos(); this.fadeOutOrigin = ImGui.GetWindowPos();
var isCollapsed = ImGui.IsWindowCollapsed();
var isDocked = ImGui.IsWindowDocked();
ImGui.End(); ImGui.End();
@ -607,7 +609,12 @@ public abstract class Window
this.pushedFadeInAlpha = false; this.pushedFadeInAlpha = false;
} }
if (!this.internalIsOpen && this.fadeOutTexture == null && doFades) // TODO: No fade-out if the window is collapsed. We could do this if we knew the "FullSize" of the window
// from the internal ImGuiWindow, but I don't want to mess with that here for now. We can do this a lot
// easier with the new bindings.
// TODO: No fade-out if docking is enabled and the window is docked, since this makes them "unsnap".
// Ideally we should get rid of this "fake window" thing and just insert a new drawlist at the correct spot.
if (!this.internalIsOpen && this.fadeOutTexture == null && doFades && !isCollapsed && !isDocked)
{ {
this.fadeOutTexture = Service<TextureManager>.Get().CreateDrawListTexture( this.fadeOutTexture = Service<TextureManager>.Get().CreateDrawListTexture(
"WindowFadeOutTexture"); "WindowFadeOutTexture");
@ -833,7 +840,7 @@ public abstract class Window
style.Push(ImGuiStyleVar.WindowBorderSize, 0); style.Push(ImGuiStyleVar.WindowBorderSize, 0);
style.Push(ImGuiStyleVar.FrameBorderSize, 0); style.Push(ImGuiStyleVar.FrameBorderSize, 0);
const ImGuiWindowFlags flags = ImGuiWindowFlags.NoInputs | ImGuiWindowFlags.NoNav | ImGuiWindowFlags.NoCollapse | const ImGuiWindowFlags flags = ImGuiWindowFlags.NoInputs | ImGuiWindowFlags.NoNav |
ImGuiWindowFlags.NoScrollWithMouse | ImGuiWindowFlags.NoMouseInputs | ImGuiWindowFlags.NoScrollWithMouse | ImGuiWindowFlags.NoMouseInputs |
ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoBackground; ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoBackground;
if (ImGui.Begin(this.WindowName, flags)) if (ImGui.Begin(this.WindowName, flags))