jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 22:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Address comments.

Browse source
This commit is contained in:
Lukas Brübach 2025-06-13 15:19:37 +02:00
parent cd6693a956
commit 17c52f2bc8
3 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
View file

@ -61,7 +61,6 @@ void FlatCardGroupDisplayWidget::onCardAddition(const QModelIndex &parent, int f
void FlatCardGroupDisplayWidget::onCardRemoval(const QModelIndex &parent, int first, int last) void FlatCardGroupDisplayWidget::onCardRemoval(const QModelIndex &parent, int first, int last)
{ {
Q_UNUSED(parent);
Q_UNUSED(first); Q_UNUSED(first);
Q_UNUSED(last); Q_UNUSED(last);
if (parent == trackedIndex) { if (parent == trackedIndex) {

1
cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
View file

@ -64,7 +64,6 @@ void OverlappedCardGroupDisplayWidget::onCardAddition(const QModelIndex &parent,
void OverlappedCardGroupDisplayWidget::onCardRemoval(const QModelIndex &parent, int first, int last) void OverlappedCardGroupDisplayWidget::onCardRemoval(const QModelIndex &parent, int first, int last)
{ {
Q_UNUSED(parent);
Q_UNUSED(first); Q_UNUSED(first);
Q_UNUSED(last); Q_UNUSED(last);
if (parent == trackedIndex) { if (parent == trackedIndex) {

27
cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp
View file

@ -35,8 +35,7 @@ DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
banner->setBuddy(cardGroupContainer); banner->setBuddy(cardGroupContainer);
displayCards(); displayCards();
// connect(deckListModel, &DeckListModel::dataChanged, this, &DeckCardZoneDisplayWidget::displayCards);
// connect(deckListModel, &DeckListModel::dataChanged, this, &DeckCardZoneDisplayWidget::decklistDataChanged);
connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &DeckCardZoneDisplayWidget::onCategoryAddition); connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &DeckCardZoneDisplayWidget::onCategoryAddition);
connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &DeckCardZoneDisplayWidget::onCategoryRemoval); connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &DeckCardZoneDisplayWidget::onCategoryRemoval);
} }
@ -60,27 +59,27 @@ void DeckCardZoneDisplayWidget::constructAppropriateWidget(QPersistentModelIndex
return; return;
} }
if (displayType == DisplayType::Overlap) { if (displayType == DisplayType::Overlap) {
auto *display_widget = new OverlappedCardGroupDisplayWidget( auto *displayWidget = new OverlappedCardGroupDisplayWidget(
cardGroupContainer, deckListModel, index, zoneName, categoryName, activeGroupCriteria, activeSortCriteria, cardGroupContainer, deckListModel, index, zoneName, categoryName, activeGroupCriteria, activeSortCriteria,
subBannerOpacity, cardSizeWidget); subBannerOpacity, cardSizeWidget);
connect(display_widget, SIGNAL(cardClicked(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)), this, connect(displayWidget, SIGNAL(cardClicked(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)), this,
SLOT(onClick(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *))); SLOT(onClick(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)));
connect(display_widget, SIGNAL(cardHovered(CardInfoPtr)), this, SLOT(onHover(CardInfoPtr))); connect(displayWidget, SIGNAL(cardHovered(CardInfoPtr)), this, SLOT(onHover(CardInfoPtr)));
connect(display_widget, &CardGroupDisplayWidget::cleanupRequested, this, connect(displayWidget, &CardGroupDisplayWidget::cleanupRequested, this,
&DeckCardZoneDisplayWidget::cleanupInvalidCardGroup); &DeckCardZoneDisplayWidget::cleanupInvalidCardGroup);
cardGroupLayout->addWidget(display_widget); cardGroupLayout->addWidget(displayWidget);
indexToWidgetMap.insert(index, display_widget); indexToWidgetMap.insert(index, displayWidget);
} else if (displayType == DisplayType::Flat) { } else if (displayType == DisplayType::Flat) {
auto *display_widget = auto *displayWidget =
new FlatCardGroupDisplayWidget(cardGroupContainer, deckListModel, index, zoneName, categoryName, new FlatCardGroupDisplayWidget(cardGroupContainer, deckListModel, index, zoneName, categoryName,
activeGroupCriteria, activeSortCriteria, subBannerOpacity, cardSizeWidget); activeGroupCriteria, activeSortCriteria, subBannerOpacity, cardSizeWidget);
connect(display_widget, SIGNAL(cardClicked(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)), this, connect(displayWidget, SIGNAL(cardClicked(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)), this,
SLOT(onClick(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *))); SLOT(onClick(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)));
connect(display_widget, SIGNAL(cardHovered(CardInfoPtr)), this, SLOT(onHover(CardInfoPtr))); connect(displayWidget, SIGNAL(cardHovered(CardInfoPtr)), this, SLOT(onHover(CardInfoPtr)));
connect(display_widget, &CardGroupDisplayWidget::cleanupRequested, this, connect(displayWidget, &CardGroupDisplayWidget::cleanupRequested, this,
&DeckCardZoneDisplayWidget::cleanupInvalidCardGroup); &DeckCardZoneDisplayWidget::cleanupInvalidCardGroup);
cardGroupLayout->addWidget(display_widget); cardGroupLayout->addWidget(displayWidget);
indexToWidgetMap.insert(index, display_widget); indexToWidgetMap.insert(index, displayWidget);
} }
} }