From 2b4864dd89dc6d3aeb70ec863bd092ca30c31db7 Mon Sep 17 00:00:00 2001
From: Starla Insigna <hatkirby@fourisland.com>
Date: Sun, 8 Feb 2009 17:36:34 -0500
Subject: Tweaked Window graphic values

---
 src/com/fourisland/fourpuzzle/window/ChoiceWindow.java |  3 +--
 src/com/fourisland/fourpuzzle/window/Window.java       | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/com/fourisland/fourpuzzle/window/ChoiceWindow.java b/src/com/fourisland/fourpuzzle/window/ChoiceWindow.java
index 4754f67..19d53ac 100755
--- a/src/com/fourisland/fourpuzzle/window/ChoiceWindow.java
+++ b/src/com/fourisland/fourpuzzle/window/ChoiceWindow.java
@@ -50,7 +50,6 @@ public class ChoiceWindow {
         }
 
         width += SPACER*2;
-        height -= SPACER;
         
         cacheBase = new BufferedImage(Window.Default.getFullWidth(width), Window.Default.getFullHeight(height), BufferedImage.TYPE_INT_ARGB);
         Graphics2D g2 = cacheBase.createGraphics();
@@ -66,7 +65,7 @@ public class ChoiceWindow {
         g2.setFont(g2.getFont().deriveFont(Font.BOLD));
         
         int fh = g2.getFontMetrics().getHeight();
-        int ty = Window.Default.getTopY()+fh-SPACER+y;
+        int ty = Window.Default.getTopY()+fh-(SPACER/2)+y;
         for (String choice : choices)
         {
             int fw = g2.getFontMetrics().stringWidth(choice);
diff --git a/src/com/fourisland/fourpuzzle/window/Window.java b/src/com/fourisland/fourpuzzle/window/Window.java
index 582f37e..8cdaf9a 100644
--- a/src/com/fourisland/fourpuzzle/window/Window.java
+++ b/src/com/fourisland/fourpuzzle/window/Window.java
@@ -45,13 +45,13 @@ public enum Window
     
     protected enum SystemArea
     {
-        TOP(15, 0, 1, 9),
-        TOP_RIGHT(24, 0, 8, 9),
+        TOP(15, 0, 1, 8),
+        TOP_RIGHT(24, 0, 8, 8),
         RIGHT(24, 15, 8, 1),
-        BOTTOM_RIGHT(24, 25, 8, 9),
-        BOTTOM(15, 24, 1, 9),
-        BOTTOM_LEFT(0, 24, 11, 9),
-        LEFT(0, 15, 11, 1),
+        BOTTOM_RIGHT(24, 24, 8, 8),
+        BOTTOM(15, 24, 1, 8),
+        BOTTOM_LEFT(0, 24, 8, 8),
+        LEFT(0, 15, 8, 1),
         TOP_LEFT(0, 0, 8, 8);
 
         private final int x;
-- 
cgit 1.4.1