diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp index 0f6637e53..bfbdd7e42 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp @@ -155,18 +155,6 @@ QWidget *CardGroupDisplayWidget::constructWidgetForIndex(QPersistentModelIndex i void CardGroupDisplayWidget::updateCardDisplays() { - // Custom zones are user-defined containers: they display their cards in the same - // order as the tree view, i.e. the model row order. Only criteria groups apply - // the visual sort criteria. - const bool isCustomZone = trackedIndex.data(DeckRoles::IsCustomZoneRole).toBool(); - - if (isCustomZone) { - for (int i = 0; i < deckListModel->rowCount(trackedIndex); ++i) { - addCardWidgets(QPersistentModelIndex(deckListModel->index(i, 0, trackedIndex))); - } - return; - } - DeckListSortFilterProxyModel proxy; proxy.setSourceModel(deckListModel); proxy.setSortCriteria(activeSortCriteria); diff --git a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp index d0f56011c..b00d9db1e 100644 --- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp @@ -133,16 +133,12 @@ void DeckCardZoneDisplayWidget::displayCards() } // Iterate the direct children of the tracked zone, keeping the tree view's row - // order (criteria groups first, then custom zones in their creation order). + // order (criteria groups first, then custom zones, both in the model's sort order). QList rows; for (int i = 0; i < deckListModel->rowCount(trackedIndex); ++i) { rows.append(QPersistentModelIndex(deckListModel->index(i, 0, trackedIndex))); } - std::stable_partition(rows.begin(), rows.end(), [](const QPersistentModelIndex &row) { - return !row.data(DeckRoles::IsCustomZoneRole).toBool(); - }); - for (const QPersistentModelIndex &persistent : rows) { constructAppropriateWidget(persistent); }