From 9d1f0e606733a8220fa32f8706fa4234045c2eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Wed, 13 Nov 2024 14:12:32 +0100 Subject: [PATCH] Properly update and set the DeckEditor's CardFrame to fetch by name and UUID if a card was selected from the decklist. --- cockatrice/src/client/tabs/tab_deck_editor.cpp | 6 ++++-- .../src/client/ui/widgets/cards/card_info_frame_widget.cpp | 5 +++++ .../src/client/ui/widgets/cards/card_info_frame_widget.h | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cockatrice/src/client/tabs/tab_deck_editor.cpp b/cockatrice/src/client/tabs/tab_deck_editor.cpp index 762552d75..e5a27324f 100644 --- a/cockatrice/src/client/tabs/tab_deck_editor.cpp +++ b/cockatrice/src/client/tabs/tab_deck_editor.cpp @@ -724,8 +724,10 @@ void TabDeckEditor::updateCardInfoRight(const QModelIndex ¤t, const QModel { if (!current.isValid()) return; - if (!current.model()->hasChildren(current.sibling(current.row(), 0))) - cardInfo->setCard(current.sibling(current.row(), 1).data().toString()); + if (!current.model()->hasChildren(current.sibling(current.row(), 0))) { + cardInfo->setCard(current.sibling(current.row(), 1).data().toString(), + current.sibling(current.row(), 2).data().toString()); + } } void TabDeckEditor::updateSearch(const QString &search) diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp index 620543db0..7472a645e 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp @@ -111,6 +111,11 @@ void CardInfoFrameWidget::setCard(const QString &cardName) setCard(CardDatabaseManager::getInstance()->guessCard(cardName)); } +void CardInfoFrameWidget::setCard(const QString &cardName, const QString &uuid) +{ + setCard(CardDatabaseManager::getInstance()->getCardByNameAndUUID(cardName, uuid)); +} + void CardInfoFrameWidget::setCard(AbstractCardItem *card) { if (card) { diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.h b/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.h index 2c2c4a3c8..85c308873 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.h +++ b/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.h @@ -36,6 +36,7 @@ public: public slots: void setCard(CardInfoPtr card); void setCard(const QString &cardName); + void setCard(const QString &cardName, const QString &uuid); void setCard(AbstractCardItem *card); void clearCard(); void setViewMode(int mode);