ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-02 05:43:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pi: reset open collapsibles if search results change

Browse source
This commit is contained in:
goat 2024-04-01 19:45:09 +02:00
parent 09973fa98b
commit 935c40701c
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
View file

@ -598,6 +598,7 @@ internal class PluginInstallerWindow : Window, IDisposable
using (ImRaii.Disabled(isProfileManager)) using (ImRaii.Disabled(isProfileManager))
{ {
var searchTextChanged = false; var searchTextChanged = false;
var prevSearchText = this.searchText;
ImGui.SetNextItemWidth(searchInputWidth); ImGui.SetNextItemWidth(searchInputWidth);
searchTextChanged |= ImGui.InputTextWithHint( searchTextChanged |= ImGui.InputTextWithHint(
"###XlPluginInstaller_Search", "###XlPluginInstaller_Search",
@ -617,7 +618,7 @@ internal class PluginInstallerWindow : Window, IDisposable
} }
if (searchTextChanged) if (searchTextChanged)
this.UpdateCategoriesOnSearchChange(); this.UpdateCategoriesOnSearchChange(prevSearchText);
} }
// Disable sort if changelogs or profile editor // Disable sort if changelogs or profile editor
@ -3443,15 +3444,27 @@ internal class PluginInstallerWindow : Window, IDisposable
return this.updateModalTaskCompletionSource.Task; return this.updateModalTaskCompletionSource.Task;
} }
private void UpdateCategoriesOnSearchChange() private void UpdateCategoriesOnSearchChange(string? previousSearchText)
{ {
if (string.IsNullOrEmpty(this.searchText)) if (string.IsNullOrEmpty(this.searchText))
{ {
this.categoryManager.SetCategoryHighlightsForPlugins(null); this.categoryManager.SetCategoryHighlightsForPlugins(null);
// Reset here for good measure, as we're returning from a search
this.openPluginCollapsibles.Clear();
} }
else else
{ {
var pluginsMatchingSearch = this.pluginListAvailable.Where(rm => !this.IsManifestFiltered(rm)); var pluginsMatchingSearch = this.pluginListAvailable.Where(rm => !this.IsManifestFiltered(rm)).ToArray();
// Check if the search results are different, and clear the open collapsibles if they are
if (previousSearchText != null)
{
var previousSearchResults = this.pluginListAvailable.Where(rm => !this.IsManifestFiltered(rm)).ToArray();
if (!previousSearchResults.SequenceEqual(pluginsMatchingSearch))
this.openPluginCollapsibles.Clear();
}
this.categoryManager.SetCategoryHighlightsForPlugins(pluginsMatchingSearch); this.categoryManager.SetCategoryHighlightsForPlugins(pluginsMatchingSearch);
} }
} }
@ -3459,7 +3472,7 @@ internal class PluginInstallerWindow : Window, IDisposable
private void UpdateCategoriesOnPluginsChange() private void UpdateCategoriesOnPluginsChange()
{ {
this.categoryManager.BuildCategories(this.pluginListAvailable); this.categoryManager.BuildCategories(this.pluginListAvailable);
this.UpdateCategoriesOnSearchChange(); this.UpdateCategoriesOnSearchChange(null);
} }
private void DrawFontawesomeIconOutlined(FontAwesomeIcon icon, Vector4 outline, Vector4 iconColor) private void DrawFontawesomeIconOutlined(FontAwesomeIcon icon, Vector4 outline, Vector4 iconColor)