ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-19 14:27:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat: port Dalamud windows to WindowSystem

Browse source
This commit is contained in:
goat 2021-04-05 23:22:41 +02:00
parent 65fb949c61
commit c21e7efab7
10 changed files with 252 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Dalamud/Dalamud.cs
View file

@ -231,17 +231,12 @@ namespace Dalamud
Log.Verbose("[START] PREPO OK!");
this.DalamudUi = new DalamudInterface(this);
Log.Verbose("[START] DUI OK!");
var isInterfaceLoaded = false;
if (!bool.Parse(Environment.GetEnvironmentVariable("DALAMUD_NOT_HAVE_INTERFACE") ?? "false"))
{
try
{
this.InterfaceManager = new InterfaceManager(this, this.SigScanner);
this.InterfaceManager.OnDraw += this.DalamudUi.Draw;
this.InterfaceManager.Enable();
isInterfaceLoaded = true;
@ -313,6 +308,11 @@ namespace Dalamud
this.ClientState.Enable();
Log.Verbose("[START] CS ENABLE!");
this.DalamudUi = new DalamudInterface(this);
this.InterfaceManager.OnDraw += this.DalamudUi.Draw;
Log.Verbose("[START] DUI OK!");
this.IsReady = true;
Troubleshooting.LogTroubleshooting(this, isInterfaceLoaded);
@ -373,18 +373,20 @@ namespace Dalamud
Log.Error(ex, "Plugin unload failed.");
}
this.Framework.Dispose();
this.ClientState.Dispose();
this.DalamudUi?.Dispose();
this.unloadSignal.Dispose();
this.Framework?.Dispose();
this.ClientState?.Dispose();
this.WinSock2.Dispose();
this.unloadSignal?.Dispose();
this.SigScanner.Dispose();
this.WinSock2?.Dispose();
this.Data.Dispose();
this.SigScanner?.Dispose();
this.AntiDebug.Dispose();
this.Data?.Dispose();
this.AntiDebug?.Dispose();
Log.Debug("Dalamud::Dispose() OK!");
}