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

Some minor GUI fixes, amongst which fixes for Morph display and Ponder effects.

Browse Source
This commit is contained in:
elcnesh
2014-09-15 19:29:48 +00:00
parent 89f5100ba8
commit 0c896f4110
9 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java
View File

@@ -33,7 +33,6 @@ import org.apache.commons.lang3.StringUtils;
import forge.card.CardDetailUtil;
import forge.card.CardDetailUtil.DetailColors;
import forge.card.CardEdition;
import forge.game.zone.ZoneType;
import forge.item.IPaperCard;
import forge.item.InventoryItemFromSet;
import forge.model.FModel;
@@ -246,12 +245,6 @@ public class CardDetailPanel extends SkinnedPanel {
// fill the card text
this.cdArea.setText(FSkin.encodeSymbols(CardDetailUtil.composeCardText(state), true));
if (card.isFaceDown() && card.getZone() == ZoneType.Battlefield) {
this.nameCostLabel.setText("???");
this.typeLabel.setText("Creature");
this.cdArea.setText(FSkin.encodeSymbols("(You may look at this card.)", true));
}
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {

3
forge-gui-desktop/src/main/java/forge/gui/DualListBox.java
View File

@@ -30,6 +30,7 @@ import forge.toolbox.FList;
import forge.toolbox.FPanel;
import forge.toolbox.FScrollPane;
import forge.view.CardView;
import forge.view.CardView.CardStateView;
import forge.view.FDialog;
import forge.view.SpellAbilityView;
import forge.view.ViewUtil;
@@ -328,6 +329,8 @@ public class DualListBox<T> extends FDialog {
CardView card = null;
if (obj instanceof CardView) {
card = (CardView) obj;
} else if (obj instanceof CardStateView) {
card = ((CardStateView) obj).getCard();
} else if (obj instanceof SpellAbilityView) {
card = ((SpellAbilityView) obj).getHostCard();
} else if (obj instanceof PaperCard) {

2
forge-gui-desktop/src/main/java/forge/screens/match/views/VPlayers.java
View File

@@ -25,7 +25,7 @@ import java.util.Map.Entry;
import javax.swing.JLabel;
import javax.swing.ScrollPaneConstants;
import com.beust.jcommander.internal.Lists;
import com.google.common.collect.Lists;
import net.miginfocom.swing.MigLayout;
import forge.gui.framework.DragCell;

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

@@ -326,7 +326,7 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
g2d.fillRoundRect(this.cardXOffset - n, (this.cardYOffset - n) + offset, this.cardWidth + (n * 2), this.cardHeight + (n * 2), cornerSize + n , cornerSize + n);
// White border if card is known to have it.
if (this.getCard() != null && !this.getCard().isFaceDown()) {
if (this.getCard() != null) {
CardEdition ed = FModel.getMagicDb().getEditions().get(this.getCard().getSetCode());
if (ed != null && ed.isWhiteBorder() && this.getCard().getFoilIndex() == 0) {
g2d.setColor(Color.white);
@@ -797,8 +797,7 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
private boolean showCardManaCostOverlay() {
return isShowingOverlays() &&
isPreferenceEnabled(FPref.UI_OVERLAY_CARD_MANA_COST) &&
!this.getCard().isFaceDown();
isPreferenceEnabled(FPref.UI_OVERLAY_CARD_MANA_COST);
}
private boolean showCardIdOverlay() {