fix: click the sidebar will quit from searching result.

ArchiDog1998 · Aug 19, 2023 · a7ec210 · a7ec210
1 parent 2058198
commit a7ec210
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs
@@ -169,6 +169,7 @@ private void DrawSideBar()
                         if (ImGuiHelper.NoPaddingNoColorImageButton(icon.ImGuiHandle, Vector2.One * iconSize, item.ToString()))
                         {
                             _activeTab = item;
+                            _searchResults = Array.Empty<ISearchable>();
                         }
                         ImGuiHelper.DrawActionOverlay(cursor, iconSize, _activeTab == item ? 1 : 0);
                     }, Math.Max(_scale * MIN_COLUMN_WIDTH, wholeWidth), iconSize);
@@ -183,6 +184,7 @@ private void DrawSideBar()
                     if (ImGui.Selectable(item.ToString(), _activeTab == item, ImGuiSelectableFlags.None, new Vector2(0, 20)))
                     {
                         _activeTab = item;
+                        _searchResults = Array.Empty<ISearchable>();
                     }
                     if (ImGui.IsItemHovered())
                     {
@@ -258,6 +260,7 @@ private void DrawHeader(float wholeWidth)
                     _activeTab == RotationConfigWindowTab.About, "About Icon"))
                 {
                     _activeTab = RotationConfigWindowTab.About;
+                    _searchResults = Array.Empty<ISearchable>();
                 }
                 ImguiTooltips.HoveredTooltip(LocalizationManager.RightLang.ConfigWindow_About_Punchline);
 
@@ -335,6 +338,7 @@ private void DrawRotationIcon(ICustomRotation rotation, float iconSize)
             Vector2.One * iconSize, _activeTab == RotationConfigWindowTab.Rotation))
         {
             _activeTab = RotationConfigWindowTab.Rotation;
+            _searchResults = Array.Empty<ISearchable>();
         }
         var desc = rotation.Name + $" ({rotation.RotationName})";
         if (!string.IsNullOrEmpty(rotation.Description)) desc += "\n \n" + rotation.Description;

diff --git a/RotationSolver/UI/RotationConfigWindow_Config.cs b/RotationSolver/UI/RotationConfigWindow_Config.cs
@@ -12,10 +12,11 @@ public partial class RotationConfigWindow
     internal static float Similarity(string text, string key)
     {
         var chars = text.Split(new char[] { ' ', ',', '、', '.', '。' }, StringSplitOptions.RemoveEmptyEntries);
+        var keys = key.Split(new char[] { ' ', ',', '、', '.', '。' }, StringSplitOptions.RemoveEmptyEntries);
 
-        var startWithCount = chars.Count(i => i.StartsWith(key, StringComparison.OrdinalIgnoreCase));
+        var startWithCount = chars.Count(i => keys.Any(k => i.StartsWith(k, StringComparison.OrdinalIgnoreCase)));
 
-        var containCount = chars.Count(i => i.Contains(key, StringComparison.OrdinalIgnoreCase));
+        var containCount = chars.Count(i => keys.Any(k => i.Contains(k, StringComparison.OrdinalIgnoreCase)));
 
         return startWithCount * 3 + containCount;
     }