From 01ff3f8acb870afb9b2bf00085816cfa2b695719 Mon Sep 17 00:00:00 2001
From: RickyRister <ricky.rister.wang@gmail.com>
Date: Wed, 26 Feb 2025 01:15:25 -0800
Subject: [PATCH] reapply sort and filters after each reset

---
 .../visual_deck_storage_widget.cpp              | 17 ++++++++++++++---
 .../visual_deck_storage_widget.h                |  2 ++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
index b2ea6577a..98ab17c77 100644
--- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
@@ -155,6 +155,17 @@ void VisualDeckStorageWidget::retranslateUi()
     bannerCardComboBoxVisibilityCheckBox->setText(tr("Show Banner Card Selection Option"));
 }
 
+/**
+ * Reapplies all sort and filter options by calling the appropriate update methods.
+ */
+void VisualDeckStorageWidget::reapplySortAndFilters()
+{
+    updateSortOrder();
+    updateTagFilter();
+    updateColorFilter();
+    updateSearchFilter();
+}
+
 void VisualDeckStorageWidget::createRootFolderWidget()
 {
     folderWidget = new VisualDeckStorageFolderDisplayWidget(this, this, SettingsCache::instance().getDeckPath(), false,
@@ -163,14 +174,14 @@ void VisualDeckStorageWidget::createRootFolderWidget()
     scrollArea->setWidget(folderWidget); // this automatically destroys the old folderWidget
     scrollArea->widget()->setMaximumWidth(scrollArea->viewport()->width());
     scrollArea->widget()->adjustSize();
-    updateSortOrder();
+    reapplySortAndFilters();
 }
 
 void VisualDeckStorageWidget::updateShowFolders(bool enabled)
 {
     if (folderWidget) {
         folderWidget->updateShowFolders(enabled);
-        updateSortOrder();
+        reapplySortAndFilters();
     }
 }
 
@@ -218,4 +229,4 @@ void VisualDeckStorageWidget::updateTagsVisibility(const bool visible)
     } else {
         tagFilterWidget->setHidden(true);
     }
-}
+}
\ No newline at end of file
diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h
index e98373e2e..565d111ec 100644
--- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h
+++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h
@@ -68,6 +68,8 @@ private:
     QCheckBox *tagsOnWidgetsVisibilityCheckBox;
     QScrollArea *scrollArea;
     VisualDeckStorageFolderDisplayWidget *folderWidget;
+
+    void reapplySortAndFilters();
 };
 
 #endif // VISUAL_DECK_STORAGE_WIDGET_H