From 9ade97fbadc8fdeba1f02c594f597ac2d509963d Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 9 Nov 2023 11:35:27 +0100 Subject: [PATCH] Update header icon logic for Dalamud changes --- LLib | 2 +- Squadronista/Squadronista.csproj | 2 +- Squadronista/SquadronistaPlugin.cs | 2 +- Squadronista/Windows/MainWindow.cs | 9 ++------- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/LLib b/LLib index e59d291..865a608 160000 --- a/LLib +++ b/LLib @@ -1 +1 @@ -Subproject commit e59d291f04473eae0b76712397733e2e25349953 +Subproject commit 865a6080319f8ccbcd5fd5b0004404822b6e60d4 diff --git a/Squadronista/Squadronista.csproj b/Squadronista/Squadronista.csproj index 52f36b3..fb94aab 100644 --- a/Squadronista/Squadronista.csproj +++ b/Squadronista/Squadronista.csproj @@ -1,7 +1,7 @@ net7.0-windows - 0.4 + 1.0 11.0 enable true diff --git a/Squadronista/SquadronistaPlugin.cs b/Squadronista/SquadronistaPlugin.cs index 4fbafd1..91c0745 100644 --- a/Squadronista/SquadronistaPlugin.cs +++ b/Squadronista/SquadronistaPlugin.cs @@ -87,7 +87,7 @@ public class SquadronistaPlugin : IDalamudPlugin _addonLifecycle.RegisterListener(AddonEvent.PostRefresh, "GcArmyExpedition", UpdateExpeditionState); _addonLifecycle.RegisterListener(AddonEvent.PostSetup, "GcArmyExpedition", UpdateExpeditionState); - _mainWindow = new MainWindow(this, pluginInterface, pluginLog, addonLifecycle, gameGui); + _mainWindow = new MainWindow(this, pluginLog, addonLifecycle, gameGui); _windowSystem.AddWindow(_mainWindow); } diff --git a/Squadronista/Windows/MainWindow.cs b/Squadronista/Windows/MainWindow.cs index 6d856d9..289261d 100644 --- a/Squadronista/Windows/MainWindow.cs +++ b/Squadronista/Windows/MainWindow.cs @@ -7,7 +7,6 @@ using Dalamud.Game.Addon.Lifecycle.AddonArgTypes; using Dalamud.Game.Text; using Dalamud.Interface.Colors; using Dalamud.Interface.Windowing; -using Dalamud.Plugin; using Dalamud.Plugin.Services; using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Client.UI.Agent; @@ -21,20 +20,18 @@ using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.ValueType; namespace Squadronista.Windows; -internal sealed class MainWindow : Window, IDisposable +internal sealed class MainWindow : LImGui.LWindow, IDisposable { private readonly SquadronistaPlugin _plugin; - private readonly DalamudPluginInterface _pluginInterface; private readonly IPluginLog _pluginLog; private readonly IAddonLifecycle _addonLifecycle; private readonly IGameGui _gameGui; - public MainWindow(SquadronistaPlugin plugin, DalamudPluginInterface pluginInterface, IPluginLog pluginLog, + public MainWindow(SquadronistaPlugin plugin, IPluginLog pluginLog, IAddonLifecycle addonLifecycle, IGameGui gameGui) : base("Squadronista##SquadronistaMainWindow") { _plugin = plugin; - _pluginInterface = pluginInterface; _pluginLog = pluginLog; _addonLifecycle = addonLifecycle; _gameGui = gameGui; @@ -92,8 +89,6 @@ internal sealed class MainWindow : Window, IDisposable public override unsafe void Draw() { - LImGui.AddPatreonIcon(_pluginInterface); - var agentExpedition = AgentGcArmyExpedition.Instance(); if (agentExpedition == null || agentExpedition->SelectedRow >= _plugin.AvailableMissions.Count) {