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

Merge pull request #1736 from Soreepeong/fix/notification-imgui-ini

Browse source 
Prevent notification from being saved into ui.ini
This commit is contained in:
goat 2024-03-21 00:19:04 +01:00 • committed by GitHub
commit 5270cddf6d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Dalamud/Interface/ImGuiNotification/Internal/ActiveNotification.ImGui.cs
View file

@ -38,7 +38,6 @@ internal sealed partial class ActiveNotification
var viewportPos = viewport.WorkPos; var viewportPos = viewport.WorkPos;
var viewportSize = viewport.WorkSize; var viewportSize = viewport.WorkSize;
ImGui.PushID(this.Id.GetHashCode());
ImGui.PushStyleVar(ImGuiStyleVar.Alpha, opacity); ImGui.PushStyleVar(ImGuiStyleVar.Alpha, opacity);
ImGui.PushStyleVar(ImGuiStyleVar.WindowRounding, 0f); ImGui.PushStyleVar(ImGuiStyleVar.WindowRounding, 0f);
ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, new Vector2(NotificationConstants.ScaledWindowPadding)); ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, new Vector2(NotificationConstants.ScaledWindowPadding));
@ -74,7 +73,9 @@ internal sealed partial class ActiveNotification
ImGuiWindowFlags.NoNav | ImGuiWindowFlags.NoNav |
ImGuiWindowFlags.NoMove | ImGuiWindowFlags.NoMove |
ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoFocusOnAppearing |
ImGuiWindowFlags.NoDocking); ImGuiWindowFlags.NoDocking |
ImGuiWindowFlags.NoSavedSettings);
ImGui.PushID(this.Id.GetHashCode());
var isFocused = ImGui.IsWindowFocused(); var isFocused = ImGui.IsWindowFocused();
var isHovered = ImGui.IsWindowHovered(ImGuiHoveredFlags.AllowWhenBlockedByActiveItem); var isHovered = ImGui.IsWindowHovered(ImGuiHoveredFlags.AllowWhenBlockedByActiveItem);
@ -135,11 +136,11 @@ internal sealed partial class ActiveNotification
} }
var windowSize = ImGui.GetWindowSize(); var windowSize = ImGui.GetWindowSize();
ImGui.PopID();
ImGui.End(); ImGui.End();
ImGui.PopStyleColor(); ImGui.PopStyleColor();
ImGui.PopStyleVar(3); ImGui.PopStyleVar(3);
ImGui.PopID();
return windowSize.Y; return windowSize.Y;
} }