jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-01 19:13:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use pinned printing when adding to deck. (#6108)

Browse source
This commit is contained in:
BruebachL 2025-09-07 06:26:39 +02:00 • committed by GitHub
parent 9c18e99fe2
commit 0f11fbe599
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp
View file

@ -142,8 +142,7 @@ void DeckEditorDatabaseDisplayWidget::updateCard(const QModelIndex &current, con
} }
if (!current.model()->hasChildren(current.sibling(current.row(), 0))) { if (!current.model()->hasChildren(current.sibling(current.row(), 0))) {
ExactCard card = CardDatabaseManager::getInstance()->getCard({cardName}); emit cardChanged(getCardOrPinnedPrinting(cardName));
emit cardChanged(card);
} }
} }
@ -176,7 +175,21 @@ ExactCard DeckEditorDatabaseDisplayWidget::currentCard() const
const QString cardName = currentIndex.sibling(currentIndex.row(), 0).data().toString(); const QString cardName = currentIndex.sibling(currentIndex.row(), 0).data().toString();
return CardDatabaseManager::getInstance()->getCard({cardName}); return getCardOrPinnedPrinting(cardName);
}
ExactCard DeckEditorDatabaseDisplayWidget::getCardOrPinnedPrinting(QString cardName) const
{
const auto &cardProviderId = SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardName);
ExactCard card = CardDatabaseManager::getInstance()->getCard({cardName});
if (cardProviderId != "") {
return ExactCard(card.getCardPtr(),
CardDatabaseManager::getInstance()->getSpecificPrinting({cardName, cardProviderId}));
}
return card;
} }
void DeckEditorDatabaseDisplayWidget::databaseCustomMenu(QPoint point) void DeckEditorDatabaseDisplayWidget::databaseCustomMenu(QPoint point)

1
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h
View file

@ -23,6 +23,7 @@ public:
public slots: public slots:
ExactCard currentCard() const; ExactCard currentCard() const;
ExactCard getCardOrPinnedPrinting(QString cardName) const;
void setFilterTree(FilterTree *filterTree); void setFilterTree(FilterTree *filterTree);
void clearAllDatabaseFilters(); void clearAllDatabaseFilters();