From 1440645a33e681e90da1bd76d0c51f7af017538e Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Wed, 17 Dec 2014 02:59:14 +0000
Subject: [PATCH] Add padding around edge of map

---
 .../java/forge/planarconquest/ConquestPlaneMap.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestPlaneMap.java b/forge-gui/src/main/java/forge/planarconquest/ConquestPlaneMap.java
index efb3f15354e..d05488ad140 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestPlaneMap.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestPlaneMap.java
@@ -11,7 +11,7 @@ public class ConquestPlaneMap {
     private final int gridSize;
     private final HexagonTile[][] grid;
     private int tileCount;
-    private int tileWidth, tileHeight;
+    private int tileWidth, tileHeight, padding;
 
     public ConquestPlaneMap(ConquestPlane plane) {
         int size = (int)Math.round(Math.sqrt(plane.getCardPool().size() / 3)); //use card pool size to determine grid size
@@ -27,18 +27,19 @@ public class ConquestPlaneMap {
         if (tileWidth == tileWidth0) { return; }
         tileWidth = tileWidth0;
         tileHeight = Math.round((float)tileWidth * (float)FSkinProp.IMG_HEXAGON_TILE.getHeight() / (float)FSkinProp.IMG_HEXAGON_TILE.getWidth());
+        padding = tileHeight / 2;
     }
 
     public int getWidth() {
-        return tileWidth * 3 / 4 * (gridSize - 1) + tileWidth;
+        return tileWidth * 3 / 4 * (gridSize - 1) + tileWidth + 2 * padding;
     }
     public int getHeight() {
-        return tileHeight * gridSize + tileHeight / 2;
+        return tileHeight * gridSize + tileHeight / 2 + 2 * padding;
     }
 
     public HexagonTile getTileAtPoint(float x, float y) {
         //convert pixel to axial coordinates
-        x = (x - tileWidth / 2) / tileWidth;
+        x = (x - tileWidth / 2) / tileWidth - padding;
         double t1 = y / (tileWidth / 2), t2 = Math.floor(x + t1);
         int r = (int)Math.floor((Math.floor(t1 - x) + t2) / 3); 
         int q = (int)Math.floor((Math.floor(2 * x + 1) + t2) / 3) - r;
@@ -53,6 +54,9 @@ public class ConquestPlaneMap {
     }
 
     public void draw(IPlaneMapRenderer renderer, int scrollLeft, int scrollTop, int visibleWidth, int visibleHeight) {
+        scrollLeft -= padding;
+        scrollTop -= padding;
+
         int dx = tileWidth * 3 / 4;
         int startQ = getIndexInRange((int)Math.floor((float)(scrollLeft - tileWidth) / (float)dx) + 1);
         int startR = getIndexInRange((int)Math.floor((float)(scrollTop - tileHeight * 1.5f) / (float)tileHeight) + 1);