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

[TabDeckEditor] Refactor: pass ExactCard in signal instead of widget (#6962)

Browse source 
* [TabDeckEditor] Refactor: pass ExactCard in signal instead of widget

* address comments
This commit is contained in:
RickyRister 2026-06-02 21:22:06 -07:00 • committed by GitHub
parent f52dc6dda8
commit e0cbb7f06c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 41 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
View file

@ -281,7 +281,7 @@ void VisualDeckEditorWidget::constructZoneWidgetForIndex(QPersistentModelIndex p
displayOptionsWidget->getActiveGroupCriteria(), displayOptionsWidget->getActiveSortCriteria(),
displayOptionsWidget->getDisplayType(), 20, 10, cardSizeWidget);
connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardHovered, this, &VisualDeckEditorWidget::onHover);
connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardClicked, this, &VisualDeckEditorWidget::onCardClick);
connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardClicked, this, &VisualDeckEditorWidget::cardClicked);
connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::requestCleanup, this,
&VisualDeckEditorWidget::cleanupInvalidZones);
connect(this, &VisualDeckEditorWidget::activeSortCriteriaChanged, zoneDisplayWidget,
@ -401,13 +401,6 @@ void VisualDeckEditorWidget::decklistDataChanged(QModelIndex topLeft, QModelInde
// User Interaction
// =====================================================================================================================
void VisualDeckEditorWidget::onCardClick(QMouseEvent *event,
CardInfoPictureWithTextOverlayWidget *instance,
QString zoneName)
{
emit cardClicked(event, instance, zoneName);
}
void VisualDeckEditorWidget::onHover(const ExactCard &hoveredCard)
{
// If user has any card selected, ignore hover

3
cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h
View file

@ -69,7 +69,7 @@ signals:
void activeCardChanged(const ExactCard &activeCard);
void activeGroupCriteriaChanged(QString activeGroupCriteria);
void activeSortCriteriaChanged(QStringList activeSortCriteria);
void cardClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName);
void cardClicked(QMouseEvent *event, const ExactCard &card, const QString &zoneName);
void cardAdditionRequested(const ExactCard &card);
void displayTypeChanged(DisplayType displayType);
@ -82,7 +82,6 @@ protected:
protected slots:
void onHover(const ExactCard &hoveredCard);
void onCardClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName);
void decklistModelReset();
void resizeEvent(QResizeEvent *event) override;