Fixed bug preventing minimap flagging

gwdevhub · Apr 13, 2024 · 954d512 · 954d512
1 parent f13c101
commit 954d512
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/GWToolboxdll/Widgets/Minimap/Minimap.cpp b/GWToolboxdll/Widgets/Minimap/Minimap.cpp
@@ -631,15 +631,6 @@ void Minimap::DrawSettingsInternal()
     ImGui::ShowHelp("Whether the map should be circular like the compass (default) or a square.");
 }
 
-ImGuiWindowFlags Minimap::GetWinFlags(ImGuiWindowFlags flags, const bool noinput_if_frozen) const
-{
-    flags = ToolboxWidget::GetWinFlags(flags, noinput_if_frozen);
-    if (snap_to_compass) {
-        flags |= ImGuiWindowFlags_NoInputs;
-    }
-    return flags;
-}
-
 void Minimap::LoadSettings(ToolboxIni* ini)
 {
     ToolboxWidget::LoadSettings(ini);
@@ -823,7 +814,12 @@ void Minimap::Draw(IDirect3DDevice9*)
     ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, 0));
     ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0, 0, 0, 0));
     ImGui::SetNextWindowSize(ImVec2(500.0f, 500.0f), ImGuiCond_FirstUseEver);
-    if (ImGui::Begin(Name(), nullptr, GetWinFlags(ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoBringToFrontOnFocus, true))) {
+
+    auto win_flags = ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoBringToFrontOnFocus;
+    if (snap_to_compass) {
+        win_flags |= ImGuiWindowFlags_NoInputs;
+    }
+    if (ImGui::Begin(Name(), nullptr, GetWinFlags(win_flags, true) )) {
         // window pos are already rounded by imgui, so casting is no big deal
         if (!snap_to_compass) {
             location.x = static_cast<int>(ImGui::GetWindowPos().x);

diff --git a/GWToolboxdll/Widgets/Minimap/Minimap.h b/GWToolboxdll/Widgets/Minimap/Minimap.h
@@ -77,8 +77,6 @@ class Minimap final : public ToolboxWidget {
     void SaveSettings(ToolboxIni* ini) override;
     void DrawSettingsInternal() override;
 
-    [[nodiscard]] ImGuiWindowFlags GetWinFlags(ImGuiWindowFlags flags, bool noinput_if_frozen) const override;
-
     [[nodiscard]] float GetMapRotation() const;
     [[nodiscard]] static DirectX::XMFLOAT2 GetGwinchScale();
     [[nodiscard]] GW::Vec2f ShadowstepLocation() const;