From 425ebeadeb5266772b495c547d77a9c26bef272c Mon Sep 17 00:00:00 2001 From: drdev Date: Mon, 28 Jul 2014 01:49:08 +0000 Subject: [PATCH] Remove extra vertical padding --- forge-gui-mobile/src/forge/assets/ImageCache.java | 2 +- .../src/forge/card/CardImageRenderer.java | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java index 8171c920339..e244c63ace0 100644 --- a/forge-gui-mobile/src/forge/assets/ImageCache.java +++ b/forge-gui-mobile/src/forge/assets/ImageCache.java @@ -143,7 +143,7 @@ public class ImageCache { } image = null; } - catch (final InvalidCacheLoadException ex) { + catch (final Exception ex) { image = null; } diff --git a/forge-gui-mobile/src/forge/card/CardImageRenderer.java b/forge-gui-mobile/src/forge/card/CardImageRenderer.java index aac2e2129a0..5f0e869c2c6 100644 --- a/forge-gui-mobile/src/forge/card/CardImageRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardImageRenderer.java @@ -175,12 +175,11 @@ public class CardImageRenderer { } renderer.drawRect(BORDER_THICKNESS, Color.BLACK, x, y, w, h); - float padX = TEXT_FONT.getCapHeight() * 0.75f; - float padY = padX + 2; //add a little more vertical padding - x += padX; - y += padY; - w -= 2 * padX; - h -= 2 * padY; + float padding = TEXT_FONT.getCapHeight() * 0.75f; + x += padding; + y += padding; + w -= 2 * padding; + h -= 2 * padding; 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);