From 2198fdc4e18ee39eccd5187fced893c4c8f1d269 Mon Sep 17 00:00:00 2001
From: Liza Carvelli <liza@carvel.li>
Date: Thu, 9 Nov 2023 10:48:41 +0100
Subject: [PATCH] Update header icon logic for Dalamud changes

---
 Deliveroo/Deliveroo.csproj        | 2 +-
 Deliveroo/Windows/ConfigWindow.cs | 5 +----
 Deliveroo/Windows/TurnInWindow.cs | 6 ++----
 LLib                              | 2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Deliveroo/Deliveroo.csproj b/Deliveroo/Deliveroo.csproj
index bf3557e..22c9bce 100644
--- a/Deliveroo/Deliveroo.csproj
+++ b/Deliveroo/Deliveroo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net7.0-windows</TargetFramework>
-        <Version>2.16</Version>
+        <Version>2.17</Version>
         <LangVersion>11.0</LangVersion>
         <Nullable>enable</Nullable>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
diff --git a/Deliveroo/Windows/ConfigWindow.cs b/Deliveroo/Windows/ConfigWindow.cs
index 48468f7..e40857d 100644
--- a/Deliveroo/Windows/ConfigWindow.cs
+++ b/Deliveroo/Windows/ConfigWindow.cs
@@ -5,7 +5,6 @@ using System.Numerics;
 using Dalamud.Interface;
 using Dalamud.Interface.Components;
 using Dalamud.Interface.Utility;
-using Dalamud.Interface.Windowing;
 using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
 using Deliveroo.GameData;
@@ -14,7 +13,7 @@ using LLib;
 
 namespace Deliveroo.Windows;
 
-internal sealed class ConfigWindow : Window
+internal sealed class ConfigWindow : LImGui.LWindow
 {
     private readonly DalamudPluginInterface _pluginInterface;
     private readonly DeliverooPlugin _plugin;
@@ -51,8 +50,6 @@ internal sealed class ConfigWindow : Window
 
     public override void Draw()
     {
-        LImGui.AddPatreonIcon(_pluginInterface);
-
         if (_configuration.AddVentureIfNoItemToPurchaseSelected())
             Save();
 
diff --git a/Deliveroo/Windows/TurnInWindow.cs b/Deliveroo/Windows/TurnInWindow.cs
index ff9c9d0..d7bd4ad 100644
--- a/Deliveroo/Windows/TurnInWindow.cs
+++ b/Deliveroo/Windows/TurnInWindow.cs
@@ -7,7 +7,6 @@ using Dalamud.Interface;
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Components;
 using Dalamud.Interface.Utility;
-using Dalamud.Interface.Windowing;
 using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
 using Deliveroo.GameData;
@@ -18,7 +17,7 @@ using LLib;
 
 namespace Deliveroo.Windows;
 
-internal sealed class TurnInWindow : Window
+internal sealed class TurnInWindow : LImGui.LWindow
 {
     private readonly DeliverooPlugin _plugin;
     private readonly DalamudPluginInterface _pluginInterface;
@@ -49,6 +48,7 @@ internal sealed class TurnInWindow : Window
 
         Flags = ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoCollapse;
         ShowCloseButton = false;
+        AllowClickthrough = false;
     }
 
     public bool State { get; set; }
@@ -96,8 +96,6 @@ internal sealed class TurnInWindow : Window
 
     public override unsafe void Draw()
     {
-        LImGui.AddPatreonIcon(_pluginInterface);
-
         GrandCompany grandCompany = _plugin.GetGrandCompany();
         if (grandCompany == GrandCompany.None)
         {
diff --git a/LLib b/LLib
index 8944883..865a608 160000
--- a/LLib
+++ b/LLib
@@ -1 +1 @@
-Subproject commit 89448838a1295041293bbd5dd69501ad934bdf03
+Subproject commit 865a6080319f8ccbcd5fd5b0004404822b6e60d4