diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2019-12-15 11:40:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-15 11:40:38 +0100 |
| commit | 59f347809d6b6374431ad02847b67adcb065f56e (patch) | |
| tree | fba62930c5ef9d936ae5da4bc76e1dce9b6beed9 /core | |
| parent | 6a970d009779512fea71dfad035480fc0b841a0c (diff) | |
| parent | 1d307286b482a91cc24e86a4b0053beb023a5d28 (diff) | |
| download | gdx-boardgame-59f347809d6b6374431ad02847b67adcb065f56e.zip gdx-boardgame-59f347809d6b6374431ad02847b67adcb065f56e.tar.gz | |
Merge pull request #4 from SimonIT/master
Make Assembly children protected and building on travis
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/ch/asynk/gdx/boardgame/ui/Assembly.java | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/gdx/boardgame/ui/Element.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/ch/asynk/gdx/boardgame/ui/Assembly.java b/core/src/ch/asynk/gdx/boardgame/ui/Assembly.java index 5e71a46..b2b1e28 100644 --- a/core/src/ch/asynk/gdx/boardgame/ui/Assembly.java +++ b/core/src/ch/asynk/gdx/boardgame/ui/Assembly.java @@ -7,7 +7,7 @@ import ch.asynk.gdx.boardgame.utils.IterableSet; public abstract class Assembly extends Element { - private IterableSet<Element> children; + protected IterableSet<Element> children; private Element touched; public Assembly(int c) diff --git a/core/src/ch/asynk/gdx/boardgame/ui/Element.java b/core/src/ch/asynk/gdx/boardgame/ui/Element.java index a7a820a..abefdd5 100644 --- a/core/src/ch/asynk/gdx/boardgame/ui/Element.java +++ b/core/src/ch/asynk/gdx/boardgame/ui/Element.java @@ -97,7 +97,7 @@ public abstract class Element implements Drawable, Paddable, Positionable, Touch public final void setPosition(Rectangle r) { - setPosition(r.x, r.x, r.width, r.height); + setPosition(r.x, r.y, r.width, r.height); } @Override public final void setPosition(float x, float y) |