jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 00:54:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Show correct art on middle mouse popup (#5385)

Browse source
This commit is contained in:
Zach H 2024-12-29 18:24:32 -05:00 • committed by GitHub
parent dec001114a
commit dad1aea128
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 33 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cockatrice/src/client/ui/widgets/cards/card_info_display_widget.cpp
View file

@ -11,7 +11,10 @@
#include <QVBoxLayout>
#include <utility>
CardInfoDisplayWidget::CardInfoDisplayWidget(const QString &cardName, QWidget *parent, Qt::WindowFlags flags)
CardInfoDisplayWidget::CardInfoDisplayWidget(const QString &cardName,
const QString &providerId,
QWidget *parent,
Qt::WindowFlags flags)
: QFrame(parent, flags), aspectRatio((qreal)CARD_HEIGHT / (qreal)CARD_WIDTH), info(nullptr)
{
setContentsMargins(3, 3, 3, 3);
@ -37,7 +40,7 @@ CardInfoDisplayWidget::CardInfoDisplayWidget(const QString &cardName, QWidget *p
pic->setFixedHeight(pixmapHeight);
setFixedWidth(pixmapWidth + 150);
setCard(cardName);
setCard(cardName, providerId);
// ensure our parent gets a valid size to position us correctly
resize(width(), sizeHint().height());
@ -55,9 +58,9 @@ void CardInfoDisplayWidget::setCard(CardInfoPtr card)
pic->setCard(info);
}
void CardInfoDisplayWidget::setCard(const QString &cardName)
void CardInfoDisplayWidget::setCard(const QString &cardName, const QString &providerId)
{
setCard(CardDatabaseManager::getInstance()->guessCard(cardName));
setCard(CardDatabaseManager::getInstance()->guessCard(cardName, providerId));
if (info == nullptr) {
text->setInvalidCardName(cardName);
}

7
cockatrice/src/client/ui/widgets/cards/card_info_display_widget.h
View file

@ -22,11 +22,14 @@ private:
CardInfoTextWidget *text;
public:
explicit CardInfoDisplayWidget(const QString &cardName, QWidget *parent = nullptr, Qt::WindowFlags f = {});
explicit CardInfoDisplayWidget(const QString &cardName,
const QString &providerId,
QWidget *parent = nullptr,
Qt::WindowFlags f = {});
public slots:
void setCard(CardInfoPtr card);
void setCard(const QString &cardName);
void setCard(const QString &cardName, const QString &providerId = QString());
void setCard(AbstractCardItem *card);
private slots: