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

fix render for ImageView

Browse Source
This commit is contained in:
Anthony Calosa
2024-11-13 11:10:27 +08:00
parent 5afaff814a
commit 31abd61a3f
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
View File

@@ -44,6 +44,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
private static final float PADDING = Utils.scale(5); private static final float PADDING = Utils.scale(5);
private static final float PILE_SPACING_Y = 0.1f; private static final float PILE_SPACING_Y = 0.1f;
private static final FSkinFont LABEL_FONT = FSkinFont.get(12); private static final FSkinFont LABEL_FONT = FSkinFont.get(12);
private TextRenderer textRenderer = new TextRenderer(true);
private static FSkinColor getGroupHeaderForeColor() { private static FSkinColor getGroupHeaderForeColor() {
if (Forge.isMobileAdventureMode) if (Forge.isMobileAdventureMode)
@@ -1030,7 +1031,6 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
private final float IMAGE_SIZE = CardRenderer.MANA_SYMBOL_SIZE; private final float IMAGE_SIZE = CardRenderer.MANA_SYMBOL_SIZE;
private DeckProxy deckProxy = null; private DeckProxy deckProxy = null;
private StringBuffer spireColor = new StringBuffer(); private StringBuffer spireColor = new StringBuffer();
private TextRenderer textRenderer;
private FImageComplex deckCover = null; private FImageComplex deckCover = null;
private Texture dpImg = null; private Texture dpImg = null;
//private TextureRegion tr; //private TextureRegion tr;
@@ -1070,7 +1070,6 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
if ("black".equalsIgnoreCase(s)) if ("black".equalsIgnoreCase(s))
spireColor.append("{B}"); spireColor.append("{B}");
} }
textRenderer = new TextRenderer(true);
} }
} }
} }
@@ -1155,8 +1154,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
} }
// spire colors // spire colors
if (!spireColor.isEmpty()) { if (!spireColor.isEmpty()) {
drawCardLabel(g,"", Color.GRAY, x, y, w, h); textRenderer.drawText(g, spireColor.toString(), FSkinFont.forHeight(w / 5), Color.WHITE, x, y, w, h, y, h, false, Align.center, true);
textRenderer.drawText(g, spireColor.toString(), FSkinFont.forHeight(w / 7), Color.WHITE, x, y, w, h, y, h, false, Align.center, true);
} }
} else if (item instanceof ConquestCommander) { } else if (item instanceof ConquestCommander) {
CardRenderer.drawCard(g, ((ConquestCommander) item).getCard(), x, y, w, h, pos); CardRenderer.drawCard(g, ((ConquestCommander) item).getCard(), x, y, w, h, pos);

3
forge-gui/src/main/java/forge/itemmanager/ColumnDef.java
View File

@@ -57,8 +57,9 @@ public enum ColumnDef {
NAME("lblName", "lblName", 180, false, SortState.ASC, NAME("lblName", "lblName", 180, false, SortState.ASC,
from -> { from -> {
if (from.getKey() instanceof PaperCard) { if (from.getKey() instanceof PaperCard) {
String spire = ((PaperCard) from.getKey()).getSpireColors() == null ? "" : ((PaperCard) from.getKey()).getSpireColors().toString();
String sortableName = ((PaperCard)from.getKey()).getSortableName(); String sortableName = ((PaperCard)from.getKey()).getSortableName();
return sortableName == null ? TextUtil.toSortableName(from.getKey().getName()) : sortableName; return sortableName == null ? TextUtil.toSortableName(from.getKey().getName() + spire) : sortableName + spire;
} }
return TextUtil.toSortableName(from.getKey().getName()); return TextUtil.toSortableName(from.getKey().getName());
}, },