Răsfoiți Sursa

[PR] Huntbuddy stable fix

- Fixed debug window showing up
- Disabled closing local hunts window
SheepGoMeh 2 ani în urmă
părinte
comite
064c4adf59

+ 1 - 1
HuntBuddy/HuntBuddy.csproj

@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net7.0-windows</TargetFramework>
         <Nullable>enable</Nullable>
-        <AssemblyVersion>1.0.5.1</AssemblyVersion>
+        <AssemblyVersion>1.0.5.2</AssemblyVersion>
         <FileVersion>$(AssemblyVersion)</FileVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <RootNamespace>HuntBuddy</RootNamespace>

+ 8 - 1
HuntBuddy/Windows/ConfigurationWindow.cs

@@ -22,7 +22,14 @@ public class ConfigurationWindow : Window
     {
         if (Plugin.Instance.Configuration.LockWindowPositions)
         {
-            this.Flags |= ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove;
+            if (!this.Flags.HasFlag(ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove))
+            {
+                this.Flags |= ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove;
+            }
+        }
+        else
+        {
+            this.Flags &= ~(ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove);
         }
     }
 

+ 18 - 2
HuntBuddy/Windows/LocalHuntsWindow.cs

@@ -21,18 +21,34 @@ public class LocalHuntsWindow : Window
         this.SizeCondition = ImGuiCond.Always;
 
         this.IsOpen = true;
+        this.ShowCloseButton = false;
+        this.RespectCloseHotkey = false;
     }
 
     public override void PreOpenCheck()
     {
         if (Plugin.Instance.Configuration.HideLocalHuntBackground)
         {
-            this.Flags |= ImGuiWindowFlags.NoBackground;
+            if (!this.Flags.HasFlag(ImGuiWindowFlags.NoBackground))
+            {
+                this.Flags |= ImGuiWindowFlags.NoBackground;
+            }
+        }
+        else
+        {
+            this.Flags &= ~ImGuiWindowFlags.NoBackground;
         }
 
         if (Plugin.Instance.Configuration.LockWindowPositions)
         {
-            this.Flags |= ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove;
+            if (!this.Flags.HasFlag(ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove))
+            {
+                this.Flags |= ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove;
+            }
+        }
+        else
+        {
+            this.Flags &= ~(ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove);
         }
     }
 

+ 8 - 5
HuntBuddy/Windows/MainWindow.cs

@@ -26,7 +26,14 @@ public class MainWindow : Window
     {
         if (Plugin.Instance.Configuration.LockWindowPositions)
         {
-            this.Flags |= ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove;
+            if (!this.Flags.HasFlag(ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove))
+            {
+                this.Flags |= ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove;
+            }
+        }
+        else
+        {
+            this.Flags &= ~(ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove);
         }
     }
 
@@ -35,13 +42,11 @@ public class MainWindow : Window
         if (!Plugin.Instance.MobHuntEntriesReady)
         {
             ImGui.Text("Reloading data ...");
-            ImGui.End();
             return;
         }
 
         if (InterfaceUtil.IconButton(FontAwesomeIcon.Redo, "Reload"))
         {
-            ImGui.End();
             Plugin.Instance.MobHuntEntriesReady = false;
             Task.Run(Plugin.Instance.ReloadData);
             return;
@@ -204,7 +209,5 @@ public class MainWindow : Window
 
             ImGui.TreePop();
         }
-
-        ImGui.End();
     }
 }