From c7d9646f7f47ebeff2b5c243b1b7e2fb94e2aa2f Mon Sep 17 00:00:00 2001 From: "Peter F. Patel-Schneider" Date: Wed, 16 Jan 2019 13:10:56 -0500 Subject: [PATCH] adjust highlighting for new manipulation interface --- .../src/main/java/forge/view/arcane/CardPanel.java | 4 ++-- forge-gui/src/main/java/forge/interfaces/IGuiGame.java | 2 +- forge-gui/src/main/java/forge/match/AbstractGuiGame.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java index c18d6cff758..895e023a50b 100644 --- a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java +++ b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java @@ -273,8 +273,8 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl g2d.setColor(Color.magenta); final int n2 = Math.max(1, Math.round(2 * cardWidth * CardPanel.SELECTED_BORDER_SIZE)); g2d.fillRoundRect(cardXOffset - n2, (cardYOffset - n2) + offset, cardWidth + (n2 * 2), cardHeight + (n2 * 2), cornerSize + n2, cornerSize + n2); - } else if (matchUI.isSelectable(getCard())) { // Yellow outline for selectable cards - g2d.setColor(Color.yellow); + } else if (matchUI.isSelectable(getCard())) { // Cyan outline for selectable cards + g2d.setColor(Color.cyan); final int n2 = Math.max(1, Math.round(2 * cardWidth * CardPanel.SELECTED_BORDER_SIZE)); g2d.fillRoundRect(cardXOffset - n2, (cardYOffset - n2) + offset, cardWidth + (n2 * 2), cardHeight + (n2 * 2), cornerSize + n2, cornerSize + n2); } diff --git a/forge-gui/src/main/java/forge/interfaces/IGuiGame.java b/forge-gui/src/main/java/forge/interfaces/IGuiGame.java index 7ddb89d9428..ec2c6994a0f 100644 --- a/forge-gui/src/main/java/forge/interfaces/IGuiGame.java +++ b/forge-gui/src/main/java/forge/interfaces/IGuiGame.java @@ -157,7 +157,7 @@ public interface IGuiGame { void restoreOldZones(Map playersToRestoreZonesFor); void setHighlighted(PlayerView pv, boolean b); void setUsedToPay(CardView card, boolean value); - void setSelectables(final List cards); + void setSelectables(final Iterable cards); void clearSelectables(); void awaitNextInput(); diff --git a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java index 90df99b9560..e71e4ff0293 100644 --- a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java +++ b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java @@ -221,8 +221,8 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards { } private final Set selectableCards = Sets.newHashSet(); - public void setSelectables(final List cards) { - selectableCards.addAll(cards); + public void setSelectables(final Iterable cards) { + for ( CardView cv : cards ) { selectableCards.add(cv); } } public void clearSelectables() { selectableCards.clear();