diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2015-11-10 11:34:53 +0100 | 
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2015-11-10 11:34:53 +0100 | 
| commit | 09f2b2d01df9c7ae51391c361042fb29239cc538 (patch) | |
| tree | d3fbf519aa9b1e73099850c789466aa3f4d6039a /core/src/ch/asynk/rustanddust | |
| parent | cd0cd844fbe1b4812ba211567276ca3074d32f17 (diff) | |
| download | RustAndDust-09f2b2d01df9c7ae51391c361042fb29239cc538.zip RustAndDust-09f2b2d01df9c7ae51391c361042fb29239cc538.tar.gz | |
UI: use setBtnRight and setBtnLeft
Diffstat (limited to 'core/src/ch/asynk/rustanddust')
7 files changed, 10 insertions, 10 deletions
| diff --git a/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java b/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java index bac418f..6a0762e 100644 --- a/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java +++ b/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java @@ -130,7 +130,7 @@ public class EngagementPanel extends Patch implements Animation          float y = position.getY(height) + (okBtn.getHeight() / 2.0f);          setPosition(x, y, width, height); -        okBtn.setPosition((x + width - (okBtn.getWidth() / 2.0f)), (y - (okBtn.getHeight() / 2.0f))); +        setBtnRight(okBtn);          x += PADDING;          y += PADDING; diff --git a/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java b/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java index a0a27b6..a5e3ada 100644 --- a/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java +++ b/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java @@ -62,7 +62,7 @@ public class StatisticsPanel extends Patch          float y = position.getY(height);          setPosition(x, y, width, height); -        okBtn.setPosition((x + width - (okBtn.getWidth() / 2.0f)), (y - (okBtn.getHeight() / 2.0f))); +        setBtnRight(okBtn);          y += PADDING;          x += PADDING; diff --git a/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java index a8e964a..88c582b 100644 --- a/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java @@ -141,7 +141,7 @@ public class OptionsMenu extends Patch          float y = position.getY(h);          setPosition(x, y, w, h); -        okBtn.setPosition((x + w - (okBtn.getWidth() / 2.0f)), (y - (okBtn.getHeight() / 2.0f))); +        setBtnRight(okBtn);          y += PADDING;          x += PADDING + HSPACING; diff --git a/core/src/ch/asynk/rustanddust/menu/PlayMenu.java b/core/src/ch/asynk/rustanddust/menu/PlayMenu.java index 42f4ae1..11e0edb 100644 --- a/core/src/ch/asynk/rustanddust/menu/PlayMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/PlayMenu.java @@ -89,8 +89,8 @@ public class PlayMenu extends Patch          float y = position.getY(h);          setPosition(x, y, w, h); -        okBtn.setPosition((x + w - (okBtn.getWidth() / 2.0f)), (y - (okBtn.getHeight() / 2.0f))); -        cancelBtn.setPosition((x - (cancelBtn.getWidth() / 2.0f)), okBtn.getY()); +        setBtnRight(okBtn); +        setBtnLeft(cancelBtn);          y += PADDING;          x += PADDING; diff --git a/core/src/ch/asynk/rustanddust/menu/ScenariosMenu.java b/core/src/ch/asynk/rustanddust/menu/ScenariosMenu.java index 23e6b38..7140e48 100644 --- a/core/src/ch/asynk/rustanddust/menu/ScenariosMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/ScenariosMenu.java @@ -72,8 +72,8 @@ public class ScenariosMenu extends Patch          float y = position.getY(h);          setPosition(x, y, w, h); -        okBtn.setPosition((x + w - (okBtn.getWidth() / 2.0f)), (y - (okBtn.getHeight() / 2.0f))); -        cancelBtn.setPosition((x - (cancelBtn.getWidth() / 2.0f)), okBtn.getY()); +        setBtnRight(okBtn); +        setBtnLeft(cancelBtn);          y += PADDING;          x += PADDING + HSPACING; diff --git a/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java b/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java index c1a442e..42c6520 100644 --- a/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java @@ -49,7 +49,7 @@ public class TutorialsMenu extends Patch          float y = position.getY(h);          setPosition(x, y, w, h); -        okBtn.setPosition((x + w - (okBtn.getWidth() / 2.0f)), (y - (okBtn.getHeight() / 2.0f))); +        setBtnRight(okBtn);          y += PADDING;          x += PADDING; diff --git a/core/src/ch/asynk/rustanddust/ui/OkCancel.java b/core/src/ch/asynk/rustanddust/ui/OkCancel.java index a313173..c064102 100644 --- a/core/src/ch/asynk/rustanddust/ui/OkCancel.java +++ b/core/src/ch/asynk/rustanddust/ui/OkCancel.java @@ -54,8 +54,8 @@ public class OkCancel extends Patch          float y = position.getY(height);          setPosition(x, y, width, height); -        okBtn.setPosition((x + width - (okBtn.getWidth() / 2.0f)), (y - (okBtn.getHeight() / 2.0f))); -        cancelBtn.setPosition((x - (cancelBtn.getWidth() / 2.0f)), (y - (cancelBtn.getHeight() / 2.0f))); +        setBtnRight(okBtn); +        setBtnLeft(cancelBtn);          label.setPosition((x + PADDING), (y + PADDING + okBtn.getHeight() + VSPACING));          cancelBtn.visible = true;          visible = true; | 
