Commit c7d9646f authored by Peter Patel-Schneider's avatar Peter Patel-Schneider

adjust highlighting for new manipulation interface

parent d4b4dc5b
......@@ -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);
}
......
......@@ -157,7 +157,7 @@ public interface IGuiGame {
void restoreOldZones(Map<PlayerView, Object> playersToRestoreZonesFor);
void setHighlighted(PlayerView pv, boolean b);
void setUsedToPay(CardView card, boolean value);
void setSelectables(final List<CardView> cards);
void setSelectables(final Iterable<CardView> cards);
void clearSelectables();
void awaitNextInput();
......
......@@ -221,8 +221,8 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards {
}
private final Set<CardView> selectableCards = Sets.newHashSet();
public void setSelectables(final List<CardView> cards) {
selectableCards.addAll(cards);
public void setSelectables(final Iterable<CardView> cards) {
for ( CardView cv : cards ) { selectableCards.add(cv); }
}
public void clearSelectables() {
selectableCards.clear();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment