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

More display stuff.

Browse source
This commit is contained in:
Lukas Brübach 2025-06-13 02:15:40 +02:00
parent b0b244a342
commit e2d932423e
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -69,7 +69,7 @@ void DeckCardZoneDisplayWidget::constructAppropriateWidget(QPersistentModelIndex
} else { } else {
qInfo() << categoryName << " needs a widget"; qInfo() << categoryName << " needs a widget";
} }
if (displayType == "overlap") { if (displayType == DisplayType::Overlap) {
qInfo() << "It's getting an overlap widget."; qInfo() << "It's getting an overlap widget.";
auto *display_widget = new OverlappedCardGroupDisplayWidget( auto *display_widget = new OverlappedCardGroupDisplayWidget(
cardGroupContainer, deckListModel, index, zoneName, categoryName, activeGroupCriteria, activeSortCriteria, cardGroupContainer, deckListModel, index, zoneName, categoryName, activeGroupCriteria, activeSortCriteria,
@ -81,7 +81,7 @@ void DeckCardZoneDisplayWidget::constructAppropriateWidget(QPersistentModelIndex
&DeckCardZoneDisplayWidget::cleanupInvalidCardGroup); &DeckCardZoneDisplayWidget::cleanupInvalidCardGroup);
cardGroupLayout->addWidget(display_widget); cardGroupLayout->addWidget(display_widget);
indexToWidgetMap.insert(index, display_widget); indexToWidgetMap.insert(index, display_widget);
} else if (displayType == "flat") { } else if (displayType == DisplayType::Flat) {
qInfo() << "Getting a flat widget for christmas"; qInfo() << "Getting a flat widget for christmas";
auto *display_widget = auto *display_widget =
new FlatCardGroupDisplayWidget(cardGroupContainer, deckListModel, index, zoneName, categoryName, new FlatCardGroupDisplayWidget(cardGroupContainer, deckListModel, index, zoneName, categoryName,
@ -159,7 +159,7 @@ void DeckCardZoneDisplayWidget::onHover(CardInfoPtr card)
emit cardHovered(card); emit cardHovered(card);
} }
void DeckCardZoneDisplayWidget::refreshDisplayType(const QString &_displayType) void DeckCardZoneDisplayWidget::refreshDisplayType(const DisplayType &_displayType)
{ {
displayType = _displayType; displayType = _displayType;
QLayoutItem *item; QLayoutItem *item;

6
cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
View file

@ -226,7 +226,7 @@ void VisualDeckEditorWidget::onCardAddition(const QModelIndex &parent, int first
DeckCardZoneDisplayWidget *zoneDisplayWidget = new DeckCardZoneDisplayWidget( DeckCardZoneDisplayWidget *zoneDisplayWidget = new DeckCardZoneDisplayWidget(
zoneContainer, deckListModel, index, deckListModel->data(index.sibling(index.row(), 1), Qt::EditRole).toString(), activeGroupCriteria, zoneContainer, deckListModel, index, deckListModel->data(index.sibling(index.row(), 1), Qt::EditRole).toString(), activeGroupCriteria,
activeSortCriteria, 20, 10, cardSizeWidget); activeSortCriteria, currentDisplayType, 20, 10, cardSizeWidget);
connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardHovered, this, &VisualDeckEditorWidget::onHover); connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardHovered, this, &VisualDeckEditorWidget::onHover);
connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardClicked, this, &VisualDeckEditorWidget::onCardClick); connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardClicked, this, &VisualDeckEditorWidget::onCardClick);
connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::requestCleanup, this, connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::requestCleanup, this,
@ -237,7 +237,7 @@ void VisualDeckEditorWidget::onCardAddition(const QModelIndex &parent, int first
&DeckCardZoneDisplayWidget::onActiveGroupCriteriaChanged); &DeckCardZoneDisplayWidget::onActiveGroupCriteriaChanged);
connect(this, &VisualDeckEditorWidget::displayTypeChanged, zoneDisplayWidget, connect(this, &VisualDeckEditorWidget::displayTypeChanged, zoneDisplayWidget,
&DeckCardZoneDisplayWidget::refreshDisplayType); &DeckCardZoneDisplayWidget::refreshDisplayType);
zoneDisplayWidget->refreshDisplayType(currentDisplayType == DisplayType::Flat ? "flat" : "overlap"); zoneDisplayWidget->refreshDisplayType(currentDisplayType);
zoneContainerLayout->addWidget(zoneDisplayWidget); zoneContainerLayout->addWidget(zoneDisplayWidget);
indexToWidgetMap.insert(index, zoneDisplayWidget); indexToWidgetMap.insert(index, zoneDisplayWidget);
@ -273,7 +273,7 @@ void VisualDeckEditorWidget::constructZoneWidgetsFromDeckListModel()
DeckCardZoneDisplayWidget *zoneDisplayWidget = new DeckCardZoneDisplayWidget( DeckCardZoneDisplayWidget *zoneDisplayWidget = new DeckCardZoneDisplayWidget(
zoneContainer, deckListModel, index, deckListModel->data(index.sibling(index.row(), 1), Qt::EditRole).toString(), activeGroupCriteria, zoneContainer, deckListModel, index, deckListModel->data(index.sibling(index.row(), 1), Qt::EditRole).toString(), activeGroupCriteria,
activeSortCriteria, 20, 10, cardSizeWidget); activeSortCriteria, currentDisplayType, 20, 10, cardSizeWidget);
connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardHovered, this, &VisualDeckEditorWidget::onHover); connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardHovered, this, &VisualDeckEditorWidget::onHover);
connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardClicked, this, &VisualDeckEditorWidget::onCardClick); connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardClicked, this, &VisualDeckEditorWidget::onCardClick);
connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::requestCleanup, this, connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::requestCleanup, this,