External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 12:02:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1764 from halljared/issue1755

Browse source 
Fixes #1755
This commit is contained in:
Derek M 2016-04-03 22:15:00 -04:00
commit 707b629130
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Mage.Client/src/main/java/mage/client/cards/DraftGrid.java
View file

@ -183,11 +183,8 @@ public class DraftGrid extends javax.swing.JPanel implements MouseListener {
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
} if (e.getClickCount() == 2) {
if (e.getButton() == MouseEvent.BUTTON1) {
@Override
public void mousePressed(MouseEvent e) {
if (e.getButton() == MouseEvent.BUTTON1) { // only left click select
Object obj = e.getSource(); Object obj = e.getSource();
if (obj instanceof MageCard) { if (obj instanceof MageCard) {
this.cardEventSource.doubleClick(((MageCard)obj).getOriginal(), "pick-a-card"); this.cardEventSource.doubleClick(((MageCard)obj).getOriginal(), "pick-a-card");
@ -195,7 +192,13 @@ public class DraftGrid extends javax.swing.JPanel implements MouseListener {
AudioManager.playOnDraftSelect(); AudioManager.playOnDraftSelect();
} }
} }
if (e.getButton() == MouseEvent.BUTTON3) { // only right click mark }
}
@Override
public void mousePressed(MouseEvent e) {
if (e.getButton() == MouseEvent.BUTTON1 || e.getButton() == MouseEvent.BUTTON3) { // left or right click
Object obj = e.getSource(); Object obj = e.getSource();
if (obj instanceof MageCard) { if (obj instanceof MageCard) {
if (this.markedCard != null) { if (this.markedCard != null) {