diff --git a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp index 2b588453b..635304e4f 100644 --- a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp @@ -64,7 +64,7 @@ void DeckCardZoneDisplayWidget::constructAppropriateWidget(QPersistentModelIndex } else { qInfo() << categoryName << " needs a widget"; } - if (displayType == "overlap") { + if (displayType == DisplayType::Overlap) { qInfo() << "It's getting an overlap widget."; auto *display_widget = new OverlappedCardGroupDisplayWidget( cardGroupContainer, deckListModel, index, zoneName, categoryName, activeGroupCriteria, activeSortCriteria, @@ -76,7 +76,7 @@ void DeckCardZoneDisplayWidget::constructAppropriateWidget(QPersistentModelIndex &DeckCardZoneDisplayWidget::cleanupInvalidCardGroup); cardGroupLayout->addWidget(display_widget); indexToWidgetMap.insert(index, display_widget); - } else if (displayType == "flat") { + } else if (displayType == DisplayType::Flat) { qInfo() << "Getting a flat widget for christmas"; auto *display_widget = new FlatCardGroupDisplayWidget(cardGroupContainer, deckListModel, index, zoneName, categoryName, @@ -153,7 +153,7 @@ void DeckCardZoneDisplayWidget::onHover(CardInfoPtr card) emit cardHovered(card); } -void DeckCardZoneDisplayWidget::refreshDisplayType(const QString &_displayType) +void DeckCardZoneDisplayWidget::refreshDisplayType(const DisplayType &_displayType) { displayType = _displayType; QLayoutItem *item; diff --git a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp index 8a954c666..c33ca4d80 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp @@ -226,7 +226,7 @@ void VisualDeckEditorWidget::onCardAddition(const QModelIndex &parent, int first DeckCardZoneDisplayWidget *zoneDisplayWidget = new DeckCardZoneDisplayWidget( 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::cardClicked, this, &VisualDeckEditorWidget::onCardClick); connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::requestCleanup, this, @@ -237,7 +237,7 @@ void VisualDeckEditorWidget::onCardAddition(const QModelIndex &parent, int first &DeckCardZoneDisplayWidget::onActiveGroupCriteriaChanged); connect(this, &VisualDeckEditorWidget::displayTypeChanged, zoneDisplayWidget, &DeckCardZoneDisplayWidget::refreshDisplayType); - zoneDisplayWidget->refreshDisplayType(currentDisplayType == DisplayType::Flat ? "flat" : "overlap"); + zoneDisplayWidget->refreshDisplayType(currentDisplayType); zoneContainerLayout->addWidget(zoneDisplayWidget); indexToWidgetMap.insert(index, zoneDisplayWidget); @@ -273,7 +273,7 @@ void VisualDeckEditorWidget::constructZoneWidgetsFromDeckListModel() DeckCardZoneDisplayWidget *zoneDisplayWidget = new DeckCardZoneDisplayWidget( 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::cardClicked, this, &VisualDeckEditorWidget::onCardClick); connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::requestCleanup, this,