summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/src/ch/asynk/tankontank/menu/MainMenu.java10
-rw-r--r--core/src/ch/asynk/tankontank/menu/OptionsMenu.java8
-rw-r--r--core/src/ch/asynk/tankontank/menu/ScenariosMenu.java6
3 files changed, 12 insertions, 12 deletions
diff --git a/core/src/ch/asynk/tankontank/menu/MainMenu.java b/core/src/ch/asynk/tankontank/menu/MainMenu.java
index ed03d08..ea82a0f 100644
--- a/core/src/ch/asynk/tankontank/menu/MainMenu.java
+++ b/core/src/ch/asynk/tankontank/menu/MainMenu.java
@@ -11,7 +11,7 @@ import ch.asynk.tankontank.ui.Patch;
public class MainMenu extends Patch
{
public static int PADDING = 40;
- public static int VSPACING = 20;
+ public static int VSPACING = 8;
private Label options;
private Label scenarios;
@@ -29,10 +29,10 @@ public class MainMenu extends Patch
public MainMenu(BitmapFont font, TextureAtlas atlas)
{
super(atlas.createPatch("typewriter"));
- this.options = new Label(font);
- this.scenarios = new Label(font);
- this.tutorial = new Label(font);
- this.exit = new Label(font);
+ this.options = new Label(font, 10);
+ this.scenarios = new Label(font, 10);
+ this.tutorial = new Label(font, 10);
+ this.exit = new Label(font, 10);
this.menu = Menu.NONE;
options.write("Options");
diff --git a/core/src/ch/asynk/tankontank/menu/OptionsMenu.java b/core/src/ch/asynk/tankontank/menu/OptionsMenu.java
index 4257ac6..4f53530 100644
--- a/core/src/ch/asynk/tankontank/menu/OptionsMenu.java
+++ b/core/src/ch/asynk/tankontank/menu/OptionsMenu.java
@@ -15,7 +15,7 @@ public class OptionsMenu extends Patch
public static int PADDING = 40;
public static int OK_PADDING = 10;
public static int TITLE_PADDING = 30;
- public static int VSPACING = 20;
+ public static int VSPACING = 5;
public static int HSPACING = 30;
public static String CHECK = "#";
@@ -57,12 +57,12 @@ public class OptionsMenu extends Patch
this.checkValues = new boolean[checkStrings.length];
this.checkLabels = new Label[checkStrings.length];
for (int i = 0; i < checkLabels.length; i++) {
- Label l = new Label(font);
+ Label l = new Label(font, 5f);
l.write(checkStrings[i]);
this.checkLabels[i] = l;
}
getValues();
- checkDy = font.getMultiLineBounds(CHECK).height;
+ checkDy = font.getMultiLineBounds(CHECK).height + 5;
this.visible = false;
}
@@ -125,7 +125,7 @@ public class OptionsMenu extends Patch
y += PADDING;
x += PADDING + HSPACING;
- float dy = (VSPACING + title.getHeight());
+ float dy = (VSPACING + checkLabels[0].getHeight());
fxVolume.setPosition(x, y);
fxVolumeValue.setPosition((x + fxVolume.getWidth() + 10), y);
diff --git a/core/src/ch/asynk/tankontank/menu/ScenariosMenu.java b/core/src/ch/asynk/tankontank/menu/ScenariosMenu.java
index e101a2f..4d735c5 100644
--- a/core/src/ch/asynk/tankontank/menu/ScenariosMenu.java
+++ b/core/src/ch/asynk/tankontank/menu/ScenariosMenu.java
@@ -15,7 +15,7 @@ public class ScenariosMenu extends Patch
public static int PADDING = 40;
public static int OK_PADDING = 10;
public static int TITLE_PADDING = 30;
- public static int VSPACING = 20;
+ public static int VSPACING = 5;
public static int HSPACING = 30;
public static String CHECK = "#";
@@ -37,7 +37,7 @@ public class ScenariosMenu extends Patch
this.title.write("- Scenarios");
this.battleLabels = new Label[game.factory.battles.length];
for (int i = 0; i < battleLabels.length; i++) {
- Label l = new Label(font);
+ Label l = new Label(font, 8f);
l.write(game.factory.battles[i].getName());
battleLabels[i] = l;
}
@@ -68,7 +68,7 @@ public class ScenariosMenu extends Patch
y += PADDING;
x += PADDING + HSPACING;
- float dy = (VSPACING + title.getHeight());
+ float dy = (VSPACING + battleLabels[0].getHeight());
for (int i = (battleLabels.length - 1); i > -1; i--) {
battleLabels[i].setPosition(x, y);