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

counter context sensative (#2714)

Browse source
This commit is contained in:
backendr 2017-05-13 11:48:26 +02:00 • committed by ctrlaltca
parent d9230d6c6b
commit 77e0cddbae
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/carditem.cpp
View file

@ -341,8 +341,10 @@ void CardItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{ {
if (event->button() == Qt::RightButton) { if (event->button() == Qt::RightButton) {
if (cardMenu) if (cardMenu)
if (!cardMenu->isEmpty()) if (!cardMenu->isEmpty()) {
owner->updateCardMenu(this);
cardMenu->exec(event->screenPos()); cardMenu->exec(event->screenPos());
}
} else if ((event->button() == Qt::LeftButton) && !settingsCache->getDoubleClickToPlay()) { } else if ((event->button() == Qt::LeftButton) && !settingsCache->getDoubleClickToPlay()) {
bool hideCard = false; bool hideCard = false;

3
cockatrice/src/player.cpp
View file

@ -2502,7 +2502,8 @@ void Player::updateCardMenu(const CardItem *card)
for (int i = 0; i < aAddCounter.size(); ++i) { for (int i = 0; i < aAddCounter.size(); ++i) {
cardMenu->addSeparator(); cardMenu->addSeparator();
cardMenu->addAction(aAddCounter[i]); cardMenu->addAction(aAddCounter[i]);
cardMenu->addAction(aRemoveCounter[i]); if (card->getCounters().contains(i))
cardMenu->addAction(aRemoveCounter[i]);
cardMenu->addAction(aSetCounter[i]); cardMenu->addAction(aSetCounter[i]);
} }
cardMenu->addSeparator(); cardMenu->addSeparator();