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

Fix card menu shortcuts sometimes not working in local multiplayer

Browse source
This commit is contained in:
RickyRister 2025-03-22 05:24:46 -07:00
parent c71685b261
commit 97b2b5ecf4
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cockatrice/src/game/cards/card_item.cpp
View file

@ -475,6 +475,17 @@ bool CardItem::animationEvent()
return animationIncomplete; return animationIncomplete;
} }
/**
* Checks if any of the items is a CardItem that is owned by the given player.
*/
static bool hasCardsOwnedBy(const QList<QGraphicsItem *> &items, const Player *owner)
{
return std::any_of(items.cbegin(), items.cend(), [owner](QGraphicsItem *item) {
auto *card = qgraphicsitem_cast<CardItem *>(item);
return card && card->getOwner() == owner;
});
}
QVariant CardItem::itemChange(GraphicsItemChange change, const QVariant &value) QVariant CardItem::itemChange(GraphicsItemChange change, const QVariant &value)
{ {
if ((change == ItemSelectedHasChanged) && owner != nullptr) { if ((change == ItemSelectedHasChanged) && owner != nullptr) {
@ -482,9 +493,14 @@ QVariant CardItem::itemChange(GraphicsItemChange change, const QVariant &value)
owner->setCardMenu(cardMenu); owner->setCardMenu(cardMenu);
owner->getGame()->setActiveCard(this); owner->getGame()->setActiveCard(this);
} else if (owner->getCardMenu() == cardMenu) { } else if (owner->getCardMenu() == cardMenu) {
if (scene() && scene()->selectedItems().isEmpty()) { // If selection is cleared while multiple cards are selected, there might still be items in the selection
// when this itemChange triggers.
// Delay empty check by 1 frame to ensure the entire selection is cleared first.
QTimer::singleShot(1, this, [this] {
if (scene() && !hasCardsOwnedBy(scene()->selectedItems(), owner)) {
owner->setCardMenu(nullptr); owner->setCardMenu(nullptr);
} }
});
owner->getGame()->setActiveCard(nullptr); owner->getGame()->setActiveCard(nullptr);
} }
} }