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

Adjust to selection model change.

Browse source 
Took 5 minutes
This commit is contained in:
Lukas Brübach 2025-11-27 23:33:24 +01:00 • committed by Brübach, Lukas
parent ce1896f5af
commit 39efe0ad19
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
View file

@ -32,7 +32,10 @@ CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
CardGroupDisplayWidget::updateCardDisplays(); CardGroupDisplayWidget::updateCardDisplays();
connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &CardGroupDisplayWidget::onCardAddition); connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &CardGroupDisplayWidget::onCardAddition);
connect(selectionModel, &QItemSelectionModel::selectionChanged, this, &CardGroupDisplayWidget::onSelectionChanged); if (selectionModel) {
connect(selectionModel, &QItemSelectionModel::selectionChanged, this,
&CardGroupDisplayWidget::onSelectionChanged);
}
connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &CardGroupDisplayWidget::onCardRemoval); connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &CardGroupDisplayWidget::onCardRemoval);
} }
@ -179,7 +182,9 @@ void CardGroupDisplayWidget::onActiveSortCriteriaChanged(QStringList _activeSort
void CardGroupDisplayWidget::mousePressEvent(QMouseEvent *event) void CardGroupDisplayWidget::mousePressEvent(QMouseEvent *event)
{ {
QWidget::mousePressEvent(event); QWidget::mousePressEvent(event);
selectionModel->clearSelection(); if (selectionModel) {
selectionModel->clearSelection();
}
} }
void CardGroupDisplayWidget::onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card) void CardGroupDisplayWidget::onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card)

6
cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp
View file

@ -38,8 +38,10 @@ DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
displayCards(); displayCards();
connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &DeckCardZoneDisplayWidget::onCategoryAddition); connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &DeckCardZoneDisplayWidget::onCategoryAddition);
connect(selectionModel, &QItemSelectionModel::selectionChanged, this, if (selectionModel) {
&DeckCardZoneDisplayWidget::onSelectionChanged); connect(selectionModel, &QItemSelectionModel::selectionChanged, this,
&DeckCardZoneDisplayWidget::onSelectionChanged);
}
connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &DeckCardZoneDisplayWidget::onCategoryRemoval); connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &DeckCardZoneDisplayWidget::onCategoryRemoval);
} }

2
cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp
View file

@ -115,7 +115,7 @@ void ArchidektApiResponseDeckDisplayWidget::constructZoneWidgetsFromDeckListMode
} }
DeckCardZoneDisplayWidget *zoneDisplayWidget = DeckCardZoneDisplayWidget *zoneDisplayWidget =
new DeckCardZoneDisplayWidget(zoneContainer, model, persistent, new DeckCardZoneDisplayWidget(zoneContainer, model, nullptr, persistent,
model->data(persistent.sibling(persistent.row(), 1), Qt::EditRole).toString(), model->data(persistent.sibling(persistent.row(), 1), Qt::EditRole).toString(),
"maintype", {"name"}, DisplayType::Overlap, 20, 10, cardSizeSlider); "maintype", {"name"}, DisplayType::Overlap, 20, 10, cardSizeSlider);
/*connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardHovered, this, &VisualDeckEditorWidget::onHover); /*connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardHovered, this, &VisualDeckEditorWidget::onHover);