Merge a4e2692244 into f484c98152

cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp

@@ -186,6 +186,36 @@ void VisualDeckStorageFolderDisplayWidget::updateShowFolders(bool enabled)
     header->setHidden(!showFolders);
 }
 
+/**
+ * Sorts the DeckPreviewWidgets in this folder
+ *
+ * @param comparator The comparator to use for sorting
+ * @param recursive Also sort all nested subfolders
+ */
+void VisualDeckStorageFolderDisplayWidget::sortBy(
+    const std::function<bool(DeckPreviewWidget *, DeckPreviewWidget *)> &comparator,
+    bool recursive)
+{
+    auto deckPreviewWidgets = flowWidget->findChildren<DeckPreviewWidget *>();
+
+    std::sort(deckPreviewWidgets.begin(), deckPreviewWidgets.end(), comparator);
+
+    // manually removing and re-adding is the only way to reorder widgets in a flowWidget
+    for (DeckPreviewWidget *previewWidget : deckPreviewWidgets) {
+        flowWidget->removeWidget(previewWidget);
+    }
+    for (DeckPreviewWidget *previewWidget : deckPreviewWidgets) {
+        flowWidget->addWidget(previewWidget);
+    }
+
+    if (recursive) {
+        // also sort all subfolders
+        for (auto *subFolder : findChildren<VisualDeckStorageFolderDisplayWidget *>()) {
+            subFolder->sortBy(comparator, false);
+        }
+    }
+}
+
 /**
  * Steals all DeckPreviewWidgets from this widget's nested subfolders, and deletes those subfolders
  */

cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h

@@ -20,6 +20,7 @@ public:
     void refreshUi();
     void createWidgetsForFiles();
     void createWidgetsForFolders();
+    void sortBy(const std::function<bool(DeckPreviewWidget *, DeckPreviewWidget *)> &comparator, bool recursive = true);
     void flattenFolderStructure();
     QStringList gatherAllTagsFromFlowWidget() const;
     FlowWidget *getFlowWidget() const

cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp

@@ -63,27 +63,13 @@ void VisualDeckStorageSortWidget::updateSortOrder()
     emit sortOrderChanged();
 }
 
-void VisualDeckStorageSortWidget::sortFolder(VisualDeckStorageFolderDisplayWidget *folderWidget)
+/**
-{
+ * Gets the comparator that is used for the current sortOrder
-    auto children =
+ */
-        folderWidget->getFlowWidget()->findChildren<QWidget *>(QString(), Qt::FindChildOption::FindDirectChildrenOnly);
+std::function<bool(DeckPreviewWidget *, DeckPreviewWidget *)> VisualDeckStorageSortWidget::getComparator() const
-    for (auto widget : children) {
-        auto deckPreviewWidgets =
-            widget->findChildren<DeckPreviewWidget *>(QString(), Qt::FindChildOption::FindDirectChildrenOnly);
-        auto newOrder = filterFiles(deckPreviewWidgets);
-        for (DeckPreviewWidget *previewWidget : newOrder) {
-            folderWidget->getFlowWidget()->removeWidget(previewWidget);
-        }
-        for (DeckPreviewWidget *previewWidget : newOrder) {
-            folderWidget->getFlowWidget()->addWidget(previewWidget);
-        }
-    }
-}
-
-QList<DeckPreviewWidget *> VisualDeckStorageSortWidget::filterFiles(QList<DeckPreviewWidget *> widgets)
 {
     // Sort the widgets list based on the current sort order
-    std::sort(widgets.begin(), widgets.end(), [this](DeckPreviewWidget *widget1, DeckPreviewWidget *widget2) {
+    return [sortOrder = sortOrder](const DeckPreviewWidget *widget1, const DeckPreviewWidget *widget2) {
         if (!widget1 || !widget2) {
             return false; // Handle null pointers gracefully
         }
@@ -106,7 +92,5 @@ QList<DeckPreviewWidget *> VisualDeckStorageSortWidget::filterFiles(QList<DeckPr
         }
 
         return false; // Default case, no sorting applied
-    });
+    };
-
-    return widgets;
 }

cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h

@@ -17,9 +17,9 @@ public:
     explicit VisualDeckStorageSortWidget(VisualDeckStorageWidget *parent);
     void retranslateUi();
     void updateSortOrder();
-    void sortFolder(VisualDeckStorageFolderDisplayWidget *folderWidget);
+    std::function<bool(DeckPreviewWidget *, DeckPreviewWidget *)> getComparator() const;
+
     QString getSearchText();
-    QList<DeckPreviewWidget *> filterFiles(QList<DeckPreviewWidget *> widgets);
 
 signals:
     void sortOrderChanged();

cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp

@@ -167,11 +167,7 @@ void VisualDeckStorageWidget::updateShowFolders(bool enabled)
 void VisualDeckStorageWidget::updateSortOrder()
 {
     if (folderWidget) {
-        sortWidget->sortFolder(folderWidget);
+        folderWidget->sortBy(sortWidget->getComparator());
-        for (VisualDeckStorageFolderDisplayWidget *subFolderWidget :
-             folderWidget->findChildren<VisualDeckStorageFolderDisplayWidget *>()) {
-            sortWidget->sortFolder(subFolderWidget);
-        }
     }
 }