From 180108e6f93311994c511592911d49c09dab5a14 Mon Sep 17 00:00:00 2001 From: Jeffrey Oliver Date: Thu, 12 Feb 2015 22:44:17 -0800 Subject: [PATCH 1/2] ctrl-click to add a card to a selection. --- cockatrice/src/abstractcarditem.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cockatrice/src/abstractcarditem.cpp b/cockatrice/src/abstractcarditem.cpp index 97c45afa..36179ead 100644 --- a/cockatrice/src/abstractcarditem.cpp +++ b/cockatrice/src/abstractcarditem.cpp @@ -226,7 +226,10 @@ void AbstractCardItem::setFaceDown(bool _facedown) void AbstractCardItem::mousePressEvent(QGraphicsSceneMouseEvent *event) { - if (!isSelected()) { + if ((event->modifiers() & Qt::ControlModifier)) { + setSelected(isSelected() ? false : true); + } + else if (!isSelected()) { scene()->clearSelection(); setSelected(true); } From 08166f7d249bbc4af7b33c02475e832f04cf962a Mon Sep 17 00:00:00 2001 From: Jeffrey Oliver Date: Fri, 13 Feb 2015 21:48:37 -0800 Subject: [PATCH 2/2] Use !isSelected() --- cockatrice/src/abstractcarditem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cockatrice/src/abstractcarditem.cpp b/cockatrice/src/abstractcarditem.cpp index 36179ead..7ff34b1f 100644 --- a/cockatrice/src/abstractcarditem.cpp +++ b/cockatrice/src/abstractcarditem.cpp @@ -227,7 +227,7 @@ void AbstractCardItem::setFaceDown(bool _facedown) void AbstractCardItem::mousePressEvent(QGraphicsSceneMouseEvent *event) { if ((event->modifiers() & Qt::ControlModifier)) { - setSelected(isSelected() ? false : true); + setSelected(!isSelected()); } else if (!isSelected()) { scene()->clearSelection();