summaryrefslogtreecommitdiffstats
path: root/core/src
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-12-10 17:22:46 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-12-10 17:22:46 +0100
commit8ac53a0e9561258b093270d3a9bdaa3d28fff604 (patch)
treeaac14bc7396798020eda1ea1d7a6ade27d4df7fe /core/src
parent57f4d31368386f02aa4ef14a2bb48b8e9593087b (diff)
downloadRustAndDust-8ac53a0e9561258b093270d3a9bdaa3d28fff604.zip
RustAndDust-8ac53a0e9561258b093270d3a9bdaa3d28fff604.tar.gz
OkCancel: use typewriter bg, own the padding
Diffstat (limited to 'core/src')
-rw-r--r--core/src/ch/asynk/tankontank/game/hud/OkCancel.java25
1 files changed, 14 insertions, 11 deletions
diff --git a/core/src/ch/asynk/tankontank/game/hud/OkCancel.java b/core/src/ch/asynk/tankontank/game/hud/OkCancel.java
index d62b761..51495ce 100644
--- a/core/src/ch/asynk/tankontank/game/hud/OkCancel.java
+++ b/core/src/ch/asynk/tankontank/game/hud/OkCancel.java
@@ -5,10 +5,13 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.TextureAtlas;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
-public class OkCancel extends Bg
+public class OkCancel extends Patch
{
+ public static int PADDING = 20;
+ public static int VSPACING = 10;
+ public static int HSPACING = 10;
+
public boolean ok;
- public float padding;
protected Label label;
protected Bg okBtn;
protected Bg cancelBtn;
@@ -22,14 +25,13 @@ public class OkCancel extends Bg
END_DEPLOYMENT,
}
- public OkCancel(BitmapFont font, TextureAtlas atlas, float padding)
+ public OkCancel(BitmapFont font, TextureAtlas atlas)
{
- super(atlas.findRegion("disabled"));
+ super(atlas.createPatch("typewriter"));
this.label = new Label(font);
this.okBtn = new Bg(atlas.findRegion("ok"));
this.cancelBtn = new Bg(atlas.findRegion("cancel"));
this.visible = false;
- this.padding = padding;
}
public void show(String msg, Action action)
@@ -43,17 +45,18 @@ public class OkCancel extends Bg
label.write(msg);
- float height = (label.getHeight() + (4 * padding) + okBtn.getHeight());
- float width = (label.getWidth() + (2 * padding));
- float w2 = ((3 * padding) + okBtn.getWidth() + cancelBtn.getWidth());
+ float height = (label.getHeight() + okBtn.getHeight() + (2 * PADDING) + (2 * VSPACING));
+ float width = (label.getWidth() + (2 * PADDING));
+ float w2 = (okBtn.getWidth() + cancelBtn.getWidth() + (2 * PADDING) + (1 * HSPACING));
if (w2 > width)
width = w2;
float x = position.getX(width);
float y = position.getY(height);
set(x, y, width, height);
- okBtn.setPosition((x + width - okBtn.getWidth() - padding), (y + padding));
- cancelBtn.setPosition((okBtn.getX() - cancelBtn.getWidth() - padding), okBtn.getY());
- label.setPosition((x + padding), (y + okBtn.getHeight() + (2 * padding)));
+
+ okBtn.setPosition((x + width - okBtn.getWidth() - PADDING), (y + PADDING));
+ cancelBtn.setPosition((okBtn.getX() - cancelBtn.getWidth() - HSPACING), okBtn.getY());
+ label.setPosition((x + PADDING), (y + PADDING + okBtn.getHeight() + VSPACING));
visible = true;
ok = false;
}