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

Fix so card name reflects alternate state properly

Browse Source
This commit is contained in:
drdev
2014-10-15 18:44:51 +00:00
parent 37f44764ed
commit 7c262c98e2
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/gui/CardDetailPanel.java
View File

@@ -186,7 +186,7 @@ public class CardDetailPanel extends SkinnedPanel {
final CardStateView state = card.getState(isInAltState);
if (state.getManaCost().isNoCost() || !canShow) {
nameCostLabel.setText(CardDetailUtil.formatCardName(card, canShow));
nameCostLabel.setText(CardDetailUtil.formatCardName(card, canShow, isInAltState));
}
else {
final String manaCost;
@@ -195,7 +195,7 @@ public class CardDetailPanel extends SkinnedPanel {
} else {
manaCost = state.getManaCost().toString();
}
nameCostLabel.setText(FSkin.encodeSymbols(CardDetailUtil.formatCardName(card, canShow) + " - " + manaCost, true));
nameCostLabel.setText(FSkin.encodeSymbols(CardDetailUtil.formatCardName(card, canShow, isInAltState) + " - " + manaCost, true));
}
typeLabel.setText(CardDetailUtil.formatCardType(state, canShow));

2
forge-gui-mobile/src/forge/card/CardRenderer.java
View File

@@ -415,7 +415,7 @@ public class CardRenderer {
//draw name for card
x += padding;
w -= 2 * padding;
g.drawText(CardDetailUtil.formatCardName(card, canShow), NAME_FONT, Color.BLACK, x, y, w - manaCostWidth - padding, h, false, HAlignment.LEFT, true);
g.drawText(CardDetailUtil.formatCardName(card, canShow, false), NAME_FONT, Color.BLACK, x, y, w - manaCostWidth - padding, h, false, HAlignment.LEFT, true);
//draw type and set label for card
y += h;

4
forge-gui/src/main/java/forge/card/CardDetailUtil.java
View File

@@ -162,8 +162,8 @@ public class CardDetailUtil {
return item.getName();
}
public static String formatCardName(final CardView card, final boolean canShow) {
final String name = card.getName();
public static String formatCardName(final CardView card, final boolean canShow, final boolean forAltState) {
final String name = forAltState ? card.getAlternateState().getName() : card.getName();
return StringUtils.isEmpty(name) || !canShow ? "???" : name.trim();
}