From 768016a897212e00052cd8a4d15e071a2e1073f2 Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Fri, 2 Jun 2023 15:58:53 +0200
Subject: [PATCH] Allow resetting text mod filter with right-click on arrow.

---
 OtterGui                                     |  2 +-
 Penumbra/UI/ModsTab/ModFileSystemSelector.cs | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/OtterGui b/OtterGui
index 7d0fcdba..dc4ad8a5 160000
--- a/OtterGui
+++ b/OtterGui
@@ -1 +1 @@
-Subproject commit 7d0fcdbadf70f59675e8666de014e5dcb67da35d
+Subproject commit dc4ad8a5fd0347642d3fdae5f2dc17a7fbfacaa1
diff --git a/Penumbra/UI/ModsTab/ModFileSystemSelector.cs b/Penumbra/UI/ModsTab/ModFileSystemSelector.cs
index 5a53712d..0665c68a 100644
--- a/Penumbra/UI/ModsTab/ModFileSystemSelector.cs
+++ b/Penumbra/UI/ModsTab/ModFileSystemSelector.cs
@@ -652,12 +652,13 @@ public sealed class ModFileSystemSelector : FileSystemSelector<Mod, ModFileSyste
         return false;
     }
 
-    private void DrawFilterCombo(ref bool everything)
+    private bool DrawFilterCombo(ref bool everything)
     {
         using var combo = ImRaii.Combo("##filterCombo", string.Empty,
-            ImGuiComboFlags.NoPreview | ImGuiComboFlags.PopupAlignLeft | ImGuiComboFlags.HeightLargest);
+            ImGuiComboFlags.NoPreview | ImGuiComboFlags.PopupAlignLeft | ImGuiComboFlags.HeightLargest);
+        var ret = ImGui.IsItemClicked(ImGuiMouseButton.Right);
         if (!combo)
-            return;
+            return ret;
 
         using var style = ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing,
             ImGui.GetStyle().ItemSpacing with { Y = 3 * UiHelpers.Scale });
@@ -679,10 +680,12 @@ public sealed class ModFileSystemSelector : FileSystemSelector<Mod, ModFileSyste
                 SetFilterDirty();
             }
         }
+
+        return ret;
     }
 
     /// <summary> Add the state filter combo-button to the right of the filter box. </summary>
-    protected override float CustomFilters(float width)
+    protected override (float, bool) CustomFilters(float width)
     {
         var pos            = ImGui.GetCursorPos();
         var remainingWidth = width - ImGui.GetFrameHeight();
@@ -693,17 +696,17 @@ public sealed class ModFileSystemSelector : FileSystemSelector<Mod, ModFileSyste
         ImGui.SetCursorPos(comboPos);
         // Draw combo button
         using var color = ImRaii.PushColor(ImGuiCol.Button, Colors.FilterActive, !everything);
-        DrawFilterCombo(ref everything);
+        var rightClick = DrawFilterCombo(ref everything);
         _tutorial.OpenTutorial(BasicTutorialSteps.ModFilters);
-        if (ImGui.IsItemClicked(ImGuiMouseButton.Right))
+        if (rightClick)
         {
-            _stateFilter = ModFilterExtensions.UnfilteredStateMods;
+            _stateFilter = ModFilterExtensions.UnfilteredStateMods;
             SetFilterDirty();
         }
 
         ImGuiUtil.HoverTooltip("Filter mods for their activation status.\nRight-Click to clear all filters.");
         ImGui.SetCursorPos(pos);
-        return remainingWidth;
+        return (remainingWidth, rightClick);
     }
 
     #endregion