diff options
Diffstat (limited to 'src/com')
| -rwxr-xr-x | src/com/fourisland/fourpuzzle/window/ChoiceWindow.java | 3 | ||||
| -rw-r--r-- | 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 { | |||
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | width += SPACER*2; | 52 | width += SPACER*2; |
| 53 | height -= SPACER; | ||
| 54 | 53 | ||
| 55 | cacheBase = new BufferedImage(Window.Default.getFullWidth(width), Window.Default.getFullHeight(height), BufferedImage.TYPE_INT_ARGB); | 54 | cacheBase = new BufferedImage(Window.Default.getFullWidth(width), Window.Default.getFullHeight(height), BufferedImage.TYPE_INT_ARGB); |
| 56 | Graphics2D g2 = cacheBase.createGraphics(); | 55 | Graphics2D g2 = cacheBase.createGraphics(); |
| @@ -66,7 +65,7 @@ public class ChoiceWindow { | |||
| 66 | g2.setFont(g2.getFont().deriveFont(Font.BOLD)); | 65 | g2.setFont(g2.getFont().deriveFont(Font.BOLD)); |
| 67 | 66 | ||
| 68 | int fh = g2.getFontMetrics().getHeight(); | 67 | int fh = g2.getFontMetrics().getHeight(); |
| 69 | int ty = Window.Default.getTopY()+fh-SPACER+y; | 68 | int ty = Window.Default.getTopY()+fh-(SPACER/2)+y; |
| 70 | for (String choice : choices) | 69 | for (String choice : choices) |
| 71 | { | 70 | { |
| 72 | int fw = g2.getFontMetrics().stringWidth(choice); | 71 | 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 | |||
| 45 | 45 | ||
| 46 | protected enum SystemArea | 46 | protected enum SystemArea |
| 47 | { | 47 | { |
| 48 | TOP(15, 0, 1, 9), | 48 | TOP(15, 0, 1, 8), |
| 49 | TOP_RIGHT(24, 0, 8, 9), | 49 | TOP_RIGHT(24, 0, 8, 8), |
| 50 | RIGHT(24, 15, 8, 1), | 50 | RIGHT(24, 15, 8, 1), |
| 51 | BOTTOM_RIGHT(24, 25, 8, 9), | 51 | BOTTOM_RIGHT(24, 24, 8, 8), |
| 52 | BOTTOM(15, 24, 1, 9), | 52 | BOTTOM(15, 24, 1, 8), |
| 53 | BOTTOM_LEFT(0, 24, 11, 9), | 53 | BOTTOM_LEFT(0, 24, 8, 8), |
| 54 | LEFT(0, 15, 11, 1), | 54 | LEFT(0, 15, 8, 1), |
| 55 | TOP_LEFT(0, 0, 8, 8); | 55 | TOP_LEFT(0, 0, 8, 8); |
| 56 | 56 | ||
| 57 | private final int x; | 57 | private final int x; |