From ea6f3c05de588fafad046f0a73b50e649a4241a9 Mon Sep 17 00:00:00 2001 From: Susucre <34709007+Susucre@users.noreply.github.com> Date: Thu, 17 Aug 2023 04:45:15 +0200 Subject: [PATCH] [GUI] Add Token on type line. (#10813) * [GUI] Add Token on type line. * rewrite comment. --- .../src/main/java/org/mage/card/arcane/CardRenderer.java | 5 ++++- .../main/java/org/mage/card/arcane/ModernCardRenderer.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java index 000c2694cac..8d8b521ccad 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java @@ -1,7 +1,6 @@ package org.mage.card.arcane; import mage.abilities.hint.HintUtils; -import mage.cards.ArtRect; import mage.client.dialog.PreferencesDialog; import mage.constants.AbilityType; import mage.constants.CardType; @@ -504,6 +503,10 @@ public abstract class CardRenderer { protected String getCardSuperTypeLine() { StringBuilder spType = new StringBuilder(); + if (cardView.isToken()) { + // "Token" is shown on the type line. As recent printing of tokens do. + spType.append("Token "); + } for (SuperType superType : cardView.getSuperTypes()) { spType.append(superType).append(' '); } diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java b/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java index ed6fd09d361..38fd5a856c4 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java @@ -12,6 +12,7 @@ import mage.util.SubTypes; import mage.view.CardView; import mage.view.PermanentView; import org.apache.log4j.Logger; +import static org.mage.card.arcane.ManaSymbols.getSizedManaSymbol; import javax.swing.*; import java.awt.*; @@ -28,8 +29,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import static org.mage.card.arcane.ManaSymbols.getSizedManaSymbol; - /* private void cardRendererBasedRender(Graphics2D g) { @@ -964,6 +963,7 @@ public class ModernCardRenderer extends CardRenderer { // Replace "Legendary" in type line if there's not enough space if (g.getFontMetrics().stringWidth(types) > availableWidth) { + types = types.replace("Token", "T."); types = types.replace("Legendary", "L."); }