From 438aacb9c45061f87435a3a0b93d75c817366729 Mon Sep 17 00:00:00 2001 From: Jeff Date: Wed, 8 Jul 2015 00:55:35 -0400 Subject: [PATCH 1/2] Play cards only with double left click Fix #340 --- cockatrice/src/carditem.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/cockatrice/src/carditem.cpp b/cockatrice/src/carditem.cpp index 43d24dcd..8bedb81a 100644 --- a/cockatrice/src/carditem.cpp +++ b/cockatrice/src/carditem.cpp @@ -358,13 +358,15 @@ void CardItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) void CardItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) { - if (settingsCache->getDoubleClickToPlay()) { - if (revealedCard) - zone->removeCard(this); - else - playCard(event->modifiers().testFlag(Qt::ShiftModifier)); + if (event->buttons() == Qt::LeftButton){ + if (settingsCache->getDoubleClickToPlay()) { + if (revealedCard) + zone->removeCard(this); + else + playCard(event->modifiers().testFlag(Qt::ShiftModifier)); + } + event->accept(); } - event->accept(); } From 6470e1fd10b88185554cefca141e0b816124d163 Mon Sep 17 00:00:00 2001 From: Jeff Date: Wed, 8 Jul 2015 16:25:25 -0400 Subject: [PATCH 2/2] Remove unneeded if --- cockatrice/src/carditem.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/cockatrice/src/carditem.cpp b/cockatrice/src/carditem.cpp index 8bedb81a..7b1653c3 100644 --- a/cockatrice/src/carditem.cpp +++ b/cockatrice/src/carditem.cpp @@ -358,15 +358,13 @@ void CardItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) void CardItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) { - if (event->buttons() == Qt::LeftButton){ - if (settingsCache->getDoubleClickToPlay()) { - if (revealedCard) - zone->removeCard(this); - else - playCard(event->modifiers().testFlag(Qt::ShiftModifier)); - } - event->accept(); + if (settingsCache->getDoubleClickToPlay() && event->buttons() == Qt::LeftButton) { + if (revealedCard) + zone->removeCard(this); + else + playCard(event->modifiers().testFlag(Qt::ShiftModifier)); } + event->accept(); }