ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-30 04:13:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat: do not close addons when any Window is still open

Browse source
This commit is contained in:
goat 2021-09-01 19:50:23 +02:00
parent 647d095fcc
commit 412a335b93
No known key found for this signature in database
GPG key ID: F18F057873895461
6 changed files with 68 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Dalamud/Interface/Internal/DalamudInterface.cs
View file

@ -28,8 +28,6 @@ namespace Dalamud.Interface.Internal
{
private static readonly ModuleLog Log = new("DUI");
private readonly WindowSystem windowSystem;
private readonly ChangelogWindow changelogWindow;
private readonly ColorDemoWindow colorDemoWindow;
private readonly ComponentDemoWindow componentDemoWindow;
@ -61,7 +59,7 @@ namespace Dalamud.Interface.Internal
{
var configuration = Service<DalamudConfiguration>.Get();
this.windowSystem = new WindowSystem("DalamudCore");
this.WindowSystem = new WindowSystem("DalamudCore");
this.changelogWindow = new ChangelogWindow() { IsOpen = false };
this.colorDemoWindow = new ColorDemoWindow() { IsOpen = false };
@ -77,19 +75,19 @@ namespace Dalamud.Interface.Internal
this.settingsWindow = new SettingsWindow() { IsOpen = false };
this.selfTestWindow = new SelfTestWindow() { IsOpen = false };
this.windowSystem.AddWindow(this.changelogWindow);
this.windowSystem.AddWindow(this.colorDemoWindow);
this.windowSystem.AddWindow(this.componentDemoWindow);
this.windowSystem.AddWindow(this.creditsWindow);
this.windowSystem.AddWindow(this.dataWindow);
this.windowSystem.AddWindow(this.gamepadModeNotifierWindow);
this.windowSystem.AddWindow(this.imeWindow);
this.windowSystem.AddWindow(this.consoleWindow);
this.windowSystem.AddWindow(this.pluginStatWindow);
this.windowSystem.AddWindow(this.pluginWindow);
this.windowSystem.AddWindow(this.scratchpadWindow);
this.windowSystem.AddWindow(this.settingsWindow);
this.windowSystem.AddWindow(this.selfTestWindow);
this.WindowSystem.AddWindow(this.changelogWindow);
this.WindowSystem.AddWindow(this.colorDemoWindow);
this.WindowSystem.AddWindow(this.componentDemoWindow);
this.WindowSystem.AddWindow(this.creditsWindow);
this.WindowSystem.AddWindow(this.dataWindow);
this.WindowSystem.AddWindow(this.gamepadModeNotifierWindow);
this.WindowSystem.AddWindow(this.imeWindow);
this.WindowSystem.AddWindow(this.consoleWindow);
this.WindowSystem.AddWindow(this.pluginStatWindow);
this.WindowSystem.AddWindow(this.pluginWindow);
this.WindowSystem.AddWindow(this.scratchpadWindow);
this.WindowSystem.AddWindow(this.settingsWindow);
this.WindowSystem.AddWindow(this.selfTestWindow);
ImGuiManagedAsserts.EnableAsserts = true;
@ -98,6 +96,11 @@ namespace Dalamud.Interface.Internal
Log.Information("Windows added");
}
/// <summary>
/// Gets the <see cref="WindowSystem"/> controlling all Dalamud-internal windows.
/// </summary>
public WindowSystem WindowSystem { get; init; }
/// <summary>
/// Gets or sets a value indicating whether the /xldev menu is open.
/// </summary>
@ -117,7 +120,7 @@ namespace Dalamud.Interface.Internal
{
Service<InterfaceManager>.Get().Draw -= this.OnDraw;
this.windowSystem.RemoveAllWindows();
this.WindowSystem.RemoveAllWindows();
this.creditsWindow.Dispose();
this.consoleWindow.Dispose();
@ -309,7 +312,7 @@ namespace Dalamud.Interface.Internal
if (Service<GameGui>.Get().GameUiHidden)
return;
this.windowSystem.Draw();
this.WindowSystem.Draw();
if (this.isImGuiDrawDemoWindow)
ImGui.ShowDemoWindow();