From 482ab4b87c937bf1378cee67c8f0cdd936c5a8a9 Mon Sep 17 00:00:00 2001 From: "Peter F. Patel-Schneider" Date: Mon, 14 Jan 2019 07:30:05 -0500 Subject: [PATCH] Add left-click to top and right-click to bottom for ListCardArea --- .../forge/view/arcane/FloatingCardArea.java | 4 +-- .../java/forge/view/arcane/ListCardArea.java | 25 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java index f60bb6b06cd..a19d4033c8f 100644 --- a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java +++ b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java @@ -200,12 +200,12 @@ public abstract class FloatingCardArea extends CardArea { super.mouseOver(panel, evt); } @Override - public final void mouseLeftClicked(final CardPanel panel, final MouseEvent evt) { + public void mouseLeftClicked(final CardPanel panel, final MouseEvent evt) { getMatchUI().getGameController().selectCard(panel.getCard(), null, new MouseTriggerEvent(evt)); super.mouseLeftClicked(panel, evt); } @Override - public final void mouseRightClicked(final CardPanel panel, final MouseEvent evt) { + public void mouseRightClicked(final CardPanel panel, final MouseEvent evt) { getMatchUI().getGameController().selectCard(panel.getCard(), null, new MouseTriggerEvent(evt)); super.mouseRightClicked(panel, evt); } diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/ListCardArea.java b/forge-gui-desktop/src/main/java/forge/view/arcane/ListCardArea.java index 5d3b7b46c06..ccffd1e8479 100644 --- a/forge-gui-desktop/src/main/java/forge/view/arcane/ListCardArea.java +++ b/forge-gui-desktop/src/main/java/forge/view/arcane/ListCardArea.java @@ -232,4 +232,29 @@ public class ListCardArea extends FloatingCardArea { //} } + @Override + public final void mouseLeftClicked(final CardPanel panel, final MouseEvent evt) { + final Card clickCard = panelToCard(panel); + if (moveableCards.contains(clickCard) && toTop) { + synchronized (cardList) { + cardList.remove(clickCard); + cardList.add(0,clickCard); + } + refresh(); + } + super.mouseLeftClicked(panel, evt); + } + @Override + public final void mouseRightClicked(final CardPanel panel, final MouseEvent evt) { + final Card clickCard = panelToCard(panel); + if (moveableCards.contains(clickCard) && toBottom ) { + synchronized (cardList) { + cardList.remove(clickCard); + cardList.add(clickCard); + } + refresh(); + } + super.mouseRightClicked(panel, evt); + } + }