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

Improve p/t box layout

Browse Source
This commit is contained in:
drdev
2014-07-28 00:49:08 +00:00
parent 13e94a2109
commit e74ad85a8c
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
forge-gui-mobile/src/forge/card/CardImageRenderer.java
View File

@@ -22,6 +22,7 @@ public class CardImageRenderer {
private static final float IMAGE_WIDTH = 360; private static final float IMAGE_WIDTH = 360;
private static final float IMAGE_HEIGHT = 504; private static final float IMAGE_HEIGHT = 504;
private static final float MANA_SYMBOL_SIZE = 20; private static final float MANA_SYMBOL_SIZE = 20;
private static final float PT_BOX_WIDTH = 56;
private static final float HEADER_PADDING = 4; private static final float HEADER_PADDING = 4;
private static final FSkinFont NAME_FONT = FSkinFont.forHeight(MANA_SYMBOL_SIZE); private static final FSkinFont NAME_FONT = FSkinFont.forHeight(MANA_SYMBOL_SIZE);
private static final FSkinFont TYPE_FONT = FSkinFont.forHeight(MANA_SYMBOL_SIZE * 0.9f); private static final FSkinFont TYPE_FONT = FSkinFont.forHeight(MANA_SYMBOL_SIZE * 0.9f);
@@ -179,7 +180,9 @@ public class CardImageRenderer {
y += padY; y += padY;
w -= 2 * padX; w -= 2 * padX;
h -= 2 * padY; h -= 2 * padY;
cardTextRenderer.drawText(renderer, card.getRules().getOracleText(), TEXT_FONT, Color.BLACK, x, y, w, h, y, h, true, HAlignment.LEFT, true); String text = card.getRules().getOracleText();
text = text.replace("\\n", "\n"); //replace new line placeholders with actual new line characters
cardTextRenderer.drawText(renderer, text, TEXT_FONT, Color.BLACK, x, y, w, h, y, h, true, HAlignment.LEFT, true);
} }
private static void drawPtBox(TextureRenderer renderer, Card card, Color color1, Color color2, float x, float y, float w, float h) { private static void drawPtBox(TextureRenderer renderer, Card card, Color color1, Color color2, float x, float y, float w, float h) {
@@ -195,18 +198,18 @@ public class CardImageRenderer {
else { return; } else { return; }
float padding = Math.round(PT_FONT.getCapHeight() / 4); float padding = Math.round(PT_FONT.getCapHeight() / 4);
float boxWidth = 3 * padding; float totalPieceWidth = -padding;
List<Float> pieceWidths = new ArrayList<Float>(); List<Float> pieceWidths = new ArrayList<Float>();
for (String piece : pieces) { for (String piece : pieces) {
float pieceWidth = PT_FONT.getBounds(piece).width + padding; float pieceWidth = PT_FONT.getBounds(piece).width + padding;
pieceWidths.add(pieceWidth); pieceWidths.add(pieceWidth);
boxWidth += pieceWidth; totalPieceWidth += pieceWidth;
} }
float boxHeight = PT_FONT.getCapHeight() + PT_FONT.getAscent() + 3 * padding; float boxHeight = PT_FONT.getCapHeight() + PT_FONT.getAscent() + 3 * padding;
x += w - boxWidth; x += w - PT_BOX_WIDTH;
y += h - boxHeight; y += h - boxHeight;
w = boxWidth; w = PT_BOX_WIDTH;
h = boxHeight; h = boxHeight;
if (color2 == null) { if (color2 == null) {
@@ -217,7 +220,7 @@ public class CardImageRenderer {
} }
renderer.drawRect(1, Color.BLACK, x, y, w, h); renderer.drawRect(1, Color.BLACK, x, y, w, h);
x += 2 * padding; x += (PT_BOX_WIDTH - totalPieceWidth) / 2;
for (int i = 0; i < pieces.size(); i++) { for (int i = 0; i < pieces.size(); i++) {
renderer.drawText(pieces.get(i), PT_FONT, Color.BLACK, x, y, w, h, false, HAlignment.LEFT, true); renderer.drawText(pieces.get(i), PT_FONT, Color.BLACK, x, y, w, h, false, HAlignment.LEFT, true);
x += pieceWidths.get(i); x += pieceWidths.get(i);

4
forge-gui-mobile/src/forge/screens/home/HomeScreen.java
View File

@@ -32,7 +32,9 @@ public class HomeScreen extends FScreen {
addButton("Constructed", new FEventHandler() { addButton("Constructed", new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
forge.item.PaperCard pc = FModel.getMagicDb().getCommonCards().getCard("Llanowar Elves"); //String cardName = "LLanowar Elves";
String cardName = "Jace, the Mind Sculptor";
forge.item.PaperCard pc = FModel.getMagicDb().getCommonCards().getCard(cardName);
FOptionPane.showCardOptionDialog(Card.getCardForUi(pc), "Image for " + pc.getName() + ":", "Card Image Test", null, new String[] {"OK"}, 0, null); FOptionPane.showCardOptionDialog(Card.getCardForUi(pc), "Image for " + pc.getName() + ":", "Card Image Test", null, new String[] {"OK"}, 0, null);
//Forge.openScreen(new ConstructedScreen()); //Forge.openScreen(new ConstructedScreen());
} }