diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2015-11-09 22:20:43 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2015-11-09 22:20:43 +0100 |
| commit | 7a3d64b43b1e40c69a1efff8c487950960b27ea8 (patch) | |
| tree | 8b491509741d26edea5f84536188f9816bf7844f /core/src/ch/asynk/rustanddust/game | |
| parent | c781b30d6c7d642a2ab638be9aa0c8415f040297 (diff) | |
| download | RustAndDust-7a3d64b43b1e40c69a1efff8c487950960b27ea8.zip RustAndDust-7a3d64b43b1e40c69a1efff8c487950960b27ea8.tar.gz | |
ui: center ok/cancel buttons on box corners
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game')
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java | 5 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java b/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java index 790c8b5..e895c50 100644 --- a/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java +++ b/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java @@ -20,7 +20,6 @@ public class EngagementPanel extends Patch implements Animation private enum State { ROLL1, MOVE, ROLL2, RESULT }; public static int FLAG_HEIGHT = 24; - public static int OK_OFFSET = 10; public static int PADDING = 20; public static int VSPACING = 10; public static int HSPACING = 5; @@ -123,10 +122,10 @@ public class EngagementPanel extends Patch implements Animation float height = (okBtn.getHeight() + attackImg.getHeight() + defenseImg.getHeight() + (2 * VSPACING) + (2 * PADDING)); float width = (attackImg.getWidth() + (2 * d1Animation.getWidth()) + attack.getWidth() + w + (4 * HSPACING) + (2 * PADDING)); float x = position.getX(width); - float y = position.getY(height); + float y = position.getY(height) + (okBtn.getHeight() / 2.0f); setPosition(x, y, width, height); - okBtn.setPosition((x + width - okBtn.getWidth() + OK_OFFSET), (y - OK_OFFSET)); + okBtn.setPosition((x + width - (okBtn.getWidth() / 2.0f)), (y - (okBtn.getHeight() / 2.0f))); x = getX() + PADDING; y = getY() + PADDING; diff --git a/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java b/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java index 2e6546b..a0a27b6 100644 --- a/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java +++ b/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java @@ -13,7 +13,6 @@ import ch.asynk.rustanddust.ui.Position; public class StatisticsPanel extends Patch { - public static int OK_OFFSET = 10; public static int PADDING = 20; public static int VSPACING = 10; public static int HSPACING = 10; @@ -63,7 +62,7 @@ public class StatisticsPanel extends Patch float y = position.getY(height); setPosition(x, y, width, height); - okBtn.setPosition((x + width - okBtn.getWidth() + OK_OFFSET), (y - OK_OFFSET)); + okBtn.setPosition((x + width - (okBtn.getWidth() / 2.0f)), (y - (okBtn.getHeight() / 2.0f))); y += PADDING; x += PADDING; |