fix: escape key and lib updates

MKhayle · Oct 9, 2021 · 5397b33 · 5397b33
1 parent bb0e64c
commit 5397b33
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/src/Kapture.Test/Kapture.Test.csproj b/src/Kapture.Test/Kapture.Test.csproj
@@ -15,7 +15,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-			<PackageReference Include="Dalamud.DrunkenToad" Version="1.1.3" />
+			<PackageReference Include="Dalamud.DrunkenToad" Version="1.1.4" />
 			<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
 			<PackageReference Include="xunit" Version="2.4.1" />
 			<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
@@ -33,7 +33,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Reference Include="Dalamud, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <Reference Include="Dalamud, Version=6.0.0.6, Culture=neutral, PublicKeyToken=null">
         <HintPath>C:\Users\caleb\AppData\Roaming\XIVLauncher\addon\Hooks\dev\Dalamud.dll</HintPath>
       </Reference>
     </ItemGroup>

diff --git a/src/Kapture/Kapture.csproj b/src/Kapture/Kapture.csproj
@@ -99,7 +99,7 @@
     <ItemGroup>
 			<PackageReference Include="ILRepack" Version="2.0.18" />
 			<PackageReference Include="DalamudPackager" Version="2.1.2" />
-      <PackageReference Include="Dalamud.DrunkenToad" Version="1.1.3" />
+      <PackageReference Include="Dalamud.DrunkenToad" Version="1.1.4" />
       <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Kapture/Kapture/UserInterface/LootWindow.cs b/src/Kapture/Kapture/UserInterface/LootWindow.cs
@@ -2,8 +2,8 @@
 using System.Numerics;
 
 using CheapLoc;
-using Dalamud.DrunkenToad;
 using Dalamud.Interface;
+using Dalamud.Interface.Colors;
 using ImGuiNET;
 
 namespace Kapture
@@ -21,7 +21,6 @@ public LootWindow(KapturePlugin plugin)
             : base(plugin, Loc.Localize("LootOverlayWindow", "Loot") + "###Kapture_Loot_Window")
         {
             this.plugin = plugin;
-            this.RespectCloseHotkey = false;
         }
 
         /// <inheritdoc />
@@ -36,11 +35,11 @@ public override void Draw()
                     var col1 = 200f * ImGuiHelpers.GlobalScale;
                     var col2 = 270f * ImGuiHelpers.GlobalScale;
 
-                    ImGui.TextColored(ImGuiColors2.ToadViolet, Loc.Localize("LootItemName", "Item"));
+                    ImGui.TextColored(ImGuiColors.DalamudViolet, Loc.Localize("LootItemName", "Item"));
                     ImGui.SameLine(col1);
-                    ImGui.TextColored(ImGuiColors2.ToadViolet, Loc.Localize("LootEventType", "Event"));
+                    ImGui.TextColored(ImGuiColors.DalamudViolet, Loc.Localize("LootEventType", "Event"));
                     ImGui.SameLine(col2);
-                    ImGui.TextColored(ImGuiColors2.ToadViolet, Loc.Localize("LootPlayer", "Player"));
+                    ImGui.TextColored(ImGuiColors.DalamudViolet, Loc.Localize("LootPlayer", "Player"));
                     ImGui.Separator();
 
                     foreach (var lootEvent in lootEvents)

diff --git a/src/Kapture/Kapture/UserInterface/PluginWindow.cs b/src/Kapture/Kapture/UserInterface/PluginWindow.cs
@@ -18,6 +18,7 @@ protected PluginWindow(KapturePlugin plugin, string windowName, ImGuiWindowFlags
             : base(windowName, flags)
         {
             this.Plugin = plugin;
+            this.RespectCloseHotkey = false;
         }
 
         /// <summary>

diff --git a/src/Kapture/Kapture/UserInterface/RollWindow.cs b/src/Kapture/Kapture/UserInterface/RollWindow.cs
@@ -2,8 +2,8 @@
 using System.Numerics;
 
 using CheapLoc;
-using Dalamud.DrunkenToad;
 using Dalamud.Interface;
+using Dalamud.Interface.Colors;
 using ImGuiNET;
 
 namespace Kapture
@@ -36,11 +36,11 @@ public override void Draw()
                     var col1 = 200f * ImGuiHelpers.GlobalScale;
                     var col2 = 258f * ImGuiHelpers.GlobalScale;
 
-                    ImGui.TextColored(ImGuiColors2.ToadViolet, Loc.Localize("MonitorItemName", "Item"));
+                    ImGui.TextColored(ImGuiColors.DalamudViolet, Loc.Localize("MonitorItemName", "Item"));
                     ImGui.SameLine(col1);
-                    ImGui.TextColored(ImGuiColors2.ToadViolet, Loc.Localize("MonitorRollers", "Rollers"));
+                    ImGui.TextColored(ImGuiColors.DalamudViolet, Loc.Localize("MonitorRollers", "Rollers"));
                     ImGui.SameLine(col2);
-                    ImGui.TextColored(ImGuiColors2.ToadViolet, Loc.Localize("MonitorWinner", "Winner"));
+                    ImGui.TextColored(ImGuiColors.DalamudViolet, Loc.Localize("MonitorWinner", "Winner"));
 
                     foreach (var lootRoll in lootRolls.ToList())
                     {
@@ -54,7 +54,7 @@ public override void Draw()
                         if (!ImGui.IsItemHovered()) continue;
                         ImGui.BeginTooltip();
                         ImGui.PushTextWrapPos(ImGui.GetFontSize() * 35.0f);
-                        ImGui.TextColored(ImGuiColors2.ToadViolet, lootRoll.ItemName);
+                        ImGui.TextColored(ImGuiColors.DalamudViolet, lootRoll.ItemName);
                         ImGui.Separator();
                         foreach (var roller in lootRoll.Rollers)
                         {

diff --git a/src/Kapture/Kapture/UserInterface/SettingsWindow.cs b/src/Kapture/Kapture/UserInterface/SettingsWindow.cs
@@ -36,6 +36,7 @@ public SettingsWindow(KapturePlugin plugin)
         {
             this.plugin = plugin;
             this.UpdateItemList();
+            this.RespectCloseHotkey = true;
         }
 
         private enum Tab