From 4abce673ef69b41a12e273e891ba18296a83acdf Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sun, 5 Nov 2023 18:33:25 +0800 Subject: [PATCH] .. --- .../src/forge/toolbox/FChoiceList.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/forge-gui-mobile/src/forge/toolbox/FChoiceList.java b/forge-gui-mobile/src/forge/toolbox/FChoiceList.java index 130130800a5..c1f4dbcae11 100644 --- a/forge-gui-mobile/src/forge/toolbox/FChoiceList.java +++ b/forge-gui-mobile/src/forge/toolbox/FChoiceList.java @@ -357,16 +357,20 @@ public class FChoiceList extends FList implements ActivateHandler { @Override public void drawValue(Graphics g, T value, FSkinFont font, FSkinColor foreColor, boolean pressed, float x, float y, float w, float h) { + if (value instanceof CardView) { + CardRenderer.drawCardListItem(g, font, foreColor, (CardView) value, 0, null, x, y, w, h, compactModeHandler.isCompactMode()); + } //update manacost text to draw symbols instead - if (value.toString().contains(" {")){ + else if (value != null && value.toString().contains(" {")) { String[] values = value.toString().split(" "); - String cost = TextUtil.fastReplace(values[1],"}{", " "); - cost = TextUtil.fastReplace(TextUtil.fastReplace(cost,"{", ""),"}", ""); + String cost = TextUtil.fastReplace(value.toString().substring(value.toString().indexOf(" {")), "}{", " "); + cost = TextUtil.fastReplace(TextUtil.fastReplace(cost, "{", ""), "}", ""); ManaCost manaCost = new ManaCost(new ManaCostParser(cost)); - CardFaceSymbols.drawManaCost(g, manaCost, x + font.getBounds(values[0]+" ").width, y + (h - MANA_SYMBOL_SIZE) / 2, MANA_SYMBOL_SIZE); + CardFaceSymbols.drawManaCost(g, manaCost, x + font.getBounds(values[0] + " ").width, y + (h - MANA_SYMBOL_SIZE) / 2, MANA_SYMBOL_SIZE); g.drawText(values[0], font, foreColor, x, y, w, h, allowDefaultItemWrap(), Align.left, true); } else { - g.drawText(getChoiceText(value), font, foreColor, x, y, w, h, allowDefaultItemWrap(), Align.left, true); + if (value != null) + g.drawText(getChoiceText(value), font, foreColor, x, y, w, h, allowDefaultItemWrap(), Align.left, true); } } }