external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 17:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

adjust highlighting for new manipulation interface

Browse Source
This commit is contained in:
Peter F. Patel-Schneider
2019-01-16 13:10:56 -05:00
parent d4b4dc5ba0
commit c7d9646f7f
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java
View File

@@ -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);
}

2
forge-gui/src/main/java/forge/interfaces/IGuiGame.java
View File

@@ -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();

4
forge-gui/src/main/java/forge/match/AbstractGuiGame.java
View File

@@ -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();