Merge remote-tracking branch 'origin/master' into api14-rollup

Merge pull request #2500 from nebel/window-error-pop-dalamud-style
Always pop DalamudStandard style if pushed earlier in Draw
2025-12-12 18:27:23 +01:00 · 2025-12-10 14:27:14 +00:00 · 2025-12-10 15:26:12 +01:00 · 2025-12-10 23:12:44 +09:00
1 changed files with 3 additions and 6 deletions
--- a/Dalamud/Interface/Windowing/Window.cs
+++ b/Dalamud/Interface/Windowing/Window.cs
@ -672,16 +672,13 @@ public abstract class Window
                Task.FromResult<IDalamudTextureWrap>(tex));
        }

-        if (!this.hasError)
+        if (isErrorStylePushed)
        {
-            this.PostDraw();
+            Style.StyleModelV1.DalamudStandard.Pop();
        }
        else
        {
-            if (isErrorStylePushed)
-            {
-                Style.StyleModelV1.DalamudStandard.Pop();
-            }
+            this.PostDraw();
        }

        this.PostHandlePreset(persistence);
Author	SHA1	Message	Date
github-actions[bot]	d0b7cf5017	Merge remote-tracking branch 'origin/master' into api14-rollup Some checks are pending Build Dalamud / Build on Windows (push) Waiting to run Details Build Dalamud / Check API Compatibility (push) Blocked by required conditions Details Build Dalamud / Deploy dalamud-distrib staging (push) Blocked by required conditions Details	2025-12-10 14:27:14 +00:00
goat	e07bda7e58	Merge pull request #2500 from nebel/window-error-pop-dalamud-style Some checks failed Build Dalamud / Build on Windows (push) Waiting to run Details Build Dalamud / Check API Compatibility (push) Blocked by required conditions Details Build Dalamud / Deploy dalamud-distrib staging (push) Blocked by required conditions Details Rollup changes to next version / check (api14) (push) Failing after 4s Details Tag Build / Tag Build (push) Successful in 2s Details Always pop DalamudStandard style if pushed earlier in Draw	2025-12-10 15:26:12 +01:00
nebel	b88a6bb616	Always pop DalamudStandard style if pushed earlier in Draw	2025-12-10 23:12:44 +09:00