From 42fd693af547cbfbc0a3a24332aaad0b15bb176f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 27 Nov 2019 14:58:02 +0100 Subject: UI : enlarge menus --- core/src/ch/asynk/rustanddust/RustAndDust.java | 2 +- .../ch/asynk/rustanddust/game/hud/ObjectivesPanel.java | 2 +- .../ch/asynk/rustanddust/game/hud/StatisticsPanel.java | 2 +- core/src/ch/asynk/rustanddust/menu/MainMenu.java | 4 ++-- core/src/ch/asynk/rustanddust/menu/NewGameMenu.java | 2 +- core/src/ch/asynk/rustanddust/menu/OptionsMenu.java | 17 ++++++++++------- core/src/ch/asynk/rustanddust/menu/PlayMenu.java | 2 +- core/src/ch/asynk/rustanddust/menu/ResumeMenu.java | 6 +++--- core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java | 2 +- core/src/ch/asynk/rustanddust/ui/OkCancel.java | 2 +- 10 files changed, 22 insertions(+), 19 deletions(-) diff --git a/core/src/ch/asynk/rustanddust/RustAndDust.java b/core/src/ch/asynk/rustanddust/RustAndDust.java index af6dcee..786f61c 100644 --- a/core/src/ch/asynk/rustanddust/RustAndDust.java +++ b/core/src/ch/asynk/rustanddust/RustAndDust.java @@ -242,7 +242,7 @@ public class RustAndDust extends Game float h = Gdx.graphics.getHeight(); Bg.setScale(Math.max((h * 0.00125f), 1.0f)); - parameter.size = Math.max((int) (h * 0.04f), 16); + parameter.size = Math.max((int) (h * 0.06f), 16); parameter.color = Color.BLACK; font = generator.generateFont(parameter); bgPatch = uiAtlas.createPatch(BG_PATCH); diff --git a/core/src/ch/asynk/rustanddust/game/hud/ObjectivesPanel.java b/core/src/ch/asynk/rustanddust/game/hud/ObjectivesPanel.java index c97bb9a..e81fe07 100644 --- a/core/src/ch/asynk/rustanddust/game/hud/ObjectivesPanel.java +++ b/core/src/ch/asynk/rustanddust/game/hud/ObjectivesPanel.java @@ -11,7 +11,7 @@ import ch.asynk.rustanddust.game.Battle; public class ObjectivesPanel extends Patch { - public static int PADDING = 30; + public static int PADDING = 60; public static int TITLE_PADDING = 5; public static int LABEL_PADDING = 10; diff --git a/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java b/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java index 0f719e4..57780af 100644 --- a/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java +++ b/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java @@ -13,7 +13,7 @@ import ch.asynk.rustanddust.ui.Position; public class StatisticsPanel extends Patch { - public static int PADDING = 20; + public static int PADDING = 60; public static int VSPACING = 10; public static int HSPACING = 10; diff --git a/core/src/ch/asynk/rustanddust/menu/MainMenu.java b/core/src/ch/asynk/rustanddust/menu/MainMenu.java index b02a1e4..44baab3 100644 --- a/core/src/ch/asynk/rustanddust/menu/MainMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/MainMenu.java @@ -8,8 +8,8 @@ import ch.asynk.rustanddust.RustAndDust; public class MainMenu extends Patch implements MenuCtrl.Panel { - private static final int PADDING = 40; - private static final int VSPACING = 8; + private static final int PADDING = 60; + private static final int VSPACING = 40; enum Item { diff --git a/core/src/ch/asynk/rustanddust/menu/NewGameMenu.java b/core/src/ch/asynk/rustanddust/menu/NewGameMenu.java index a7002fb..4316ba1 100644 --- a/core/src/ch/asynk/rustanddust/menu/NewGameMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/NewGameMenu.java @@ -10,7 +10,7 @@ import ch.asynk.rustanddust.game.hud.ObjectivesPanel; public class NewGameMenu extends Patch implements MenuCtrl.Panel { - public static int PADDING = 50; + public static int PADDING = 60; public static int TITLE_PADDING = 35; public static int VSPACING = 30; diff --git a/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java index c3c6c11..613c63e 100644 --- a/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java @@ -12,11 +12,12 @@ import ch.asynk.rustanddust.RustAndDust; public class OptionsMenu extends Patch implements MenuCtrl.Panel { - public static int PADDING = 30; - public static int OPT_PADDING = 10; - public static int TITLE_PADDING = 10; + public static int PADDING = 60; + public static int OPT_PADDING = 20; + public static int TITLE_PADDING = 20; public static int LABEL_PADDING = 10; - public static int HSPACING = 30; + public static int HSPACING = 40; + public static int VSPACING = 20; public static String CHECK = "#"; private final RustAndDust game; @@ -114,6 +115,8 @@ public class OptionsMenu extends Patch implements MenuCtrl.Panel h += checkLabels[i].getHeight(); h += graphics.getHeight(); h += fxVolume.getHeight(); + h += (VSPACING * (checkLabels.length - 1)); + h += VSPACING * 2; float w = title.getWidth(); for (int i = 0; i < checkLabels.length; i++) { @@ -135,13 +138,13 @@ public class OptionsMenu extends Patch implements MenuCtrl.Panel graphics.setPosition(x, y); graphicsValue.setPosition((x + graphics.getWidth() + OPT_PADDING), y); - y += graphics.getHeight(); + y += graphics.getHeight() + VSPACING; fxVolume.setPosition(x, y); fxVolumeValue.setPosition((x + fxVolume.getWidth() + OPT_PADDING), y); - y += fxVolume.getHeight(); + y += fxVolume.getHeight() + VSPACING; for (int i = 0; i < checkLabels.length; i++) { checkLabels[i].setPosition(x, y); - y += checkLabels[i].getHeight(); + y += checkLabels[i].getHeight() + VSPACING; } y += TITLE_PADDING; x -= PADDING; diff --git a/core/src/ch/asynk/rustanddust/menu/PlayMenu.java b/core/src/ch/asynk/rustanddust/menu/PlayMenu.java index 1fc206f..9dc639c 100644 --- a/core/src/ch/asynk/rustanddust/menu/PlayMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/PlayMenu.java @@ -15,7 +15,7 @@ import ch.asynk.rustanddust.util.GameRecord; public class PlayMenu extends Patch implements MenuCtrl.Panel { - public static int PADDING = 40; + public static int PADDING = 60; public static int TITLE_PADDING = 30; private final RustAndDust game; diff --git a/core/src/ch/asynk/rustanddust/menu/ResumeMenu.java b/core/src/ch/asynk/rustanddust/menu/ResumeMenu.java index 70ff025..de2de48 100644 --- a/core/src/ch/asynk/rustanddust/menu/ResumeMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/ResumeMenu.java @@ -9,9 +9,9 @@ import ch.asynk.rustanddust.game.Config; public class ResumeMenu extends Patch implements MenuCtrl.Panel { - private static final int PADDING = 40; - private static final int VSPACING = 8; - private static final int TITLE_SPACING = 12; + private static final int PADDING = 60; + private static final int VSPACING = 20; + private static final int TITLE_SPACING = 30; enum Item { diff --git a/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java b/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java index d1c24a5..427a938 100644 --- a/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java @@ -9,7 +9,7 @@ import ch.asynk.rustanddust.RustAndDust; public class TutorialsMenu extends Patch implements MenuCtrl.Panel { - public static int PADDING = 40; + public static int PADDING = 60; public static int TITLE_PADDING = 30; private final RustAndDust game; diff --git a/core/src/ch/asynk/rustanddust/ui/OkCancel.java b/core/src/ch/asynk/rustanddust/ui/OkCancel.java index 75a8e23..9695a94 100644 --- a/core/src/ch/asynk/rustanddust/ui/OkCancel.java +++ b/core/src/ch/asynk/rustanddust/ui/OkCancel.java @@ -8,7 +8,7 @@ import com.badlogic.gdx.graphics.glutils.ShapeRenderer; public class OkCancel extends Patch { - public static int PADDING = 20; + public static int PADDING = 60; public static int VSPACING = 10; public static int HSPACING = 10; -- cgit v1.1-2-g2b99