From 9a2b0c16574e924f7e52bb5d569b064e38c25dc6 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sun, 11 May 2014 20:42:43 +0000
Subject: [PATCH] Fix card highlight thickness

---
 .../src/forge/screens/match/InputSelectCard.java      |  2 +-
 .../forge/screens/match/views/VCardDisplayArea.java   |  2 +-
 forge-gui-mobile/src/forge/toolbox/FCardPanel.java    | 11 +++++------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/forge-gui-mobile/src/forge/screens/match/InputSelectCard.java b/forge-gui-mobile/src/forge/screens/match/InputSelectCard.java
index cc26b6d60ed..b3814517424 100644
--- a/forge-gui-mobile/src/forge/screens/match/InputSelectCard.java
+++ b/forge-gui-mobile/src/forge/screens/match/InputSelectCard.java
@@ -343,7 +343,7 @@ public class InputSelectCard {
                         //redraw owner if needed so it appears on top of cards above it in stack
                         owner.draw(g, pos.x, pos.y);
                     }
-                    g.drawRect(2, Color.GREEN, x, y, w, h);
+                    g.drawRect(FCardPanel.PADDING, Color.GREEN, x, y, w, h);
 
                     w = getWidth();
                     x = w / 2;
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java b/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java
index 6f8d9ce3c3a..2f92dc5ba45 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java
@@ -98,7 +98,7 @@ public abstract class VCardDisplayArea extends VDisplayArea {
     }
 
     protected float getCardWidth(float cardHeight) {
-        return (cardHeight - 2 * CardAreaPanel.PADDING_Y) / CardAreaPanel.ASPECT_RATIO + 2 * CardAreaPanel.PADDING_X; //ensure aspect ratio maintained after padding applied
+        return (cardHeight - 2 * CardAreaPanel.PADDING) / CardAreaPanel.ASPECT_RATIO + 2 * CardAreaPanel.PADDING; //ensure aspect ratio maintained after padding applied
     }
 
     @Override
diff --git a/forge-gui-mobile/src/forge/toolbox/FCardPanel.java b/forge-gui-mobile/src/forge/toolbox/FCardPanel.java
index 0d280ff0b6b..5ab87ce1585 100644
--- a/forge-gui-mobile/src/forge/toolbox/FCardPanel.java
+++ b/forge-gui-mobile/src/forge/toolbox/FCardPanel.java
@@ -10,8 +10,7 @@ import forge.util.Utils;
 public class FCardPanel extends FDisplayObject {
     public static final float TAPPED_ANGLE = -90;
     public static final float ASPECT_RATIO = 3.5f / 2.5f;
-    public static final float PADDING_X = Utils.scaleX(2);
-    public static final float PADDING_Y = Utils.scaleY(2);
+    public static final float PADDING = Utils.scaleMin(2);
 
     private Card card;
     private boolean tapped;
@@ -60,10 +59,10 @@ public class FCardPanel extends FDisplayObject {
     public void draw(Graphics g, float x, float y) {
         if (card == null) { return; }
 
-        x += PADDING_X;
-        y += PADDING_Y;
-        float w = getWidth() - 2 * PADDING_X;
-        float h = getHeight() - 2 * PADDING_Y;
+        x += PADDING;
+        y += PADDING;
+        float w = getWidth() - 2 * PADDING;
+        float h = getHeight() - 2 * PADDING;
         if (w == h) { //adjust width if needed to make room for tapping
             w = h / ASPECT_RATIO;
         }