From 75f72498a57a07c7b855901ebbcabdfb5781e567 Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Wed, 24 Feb 2016 10:22:41 +0100 Subject: Scrollable: add getBestHeight(), simplify setPosition() --- core/src/ch/asynk/rustanddust/ui/Scrollable.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'core/src/ch/asynk') diff --git a/core/src/ch/asynk/rustanddust/ui/Scrollable.java b/core/src/ch/asynk/rustanddust/ui/Scrollable.java index 75482393..9f7ff2cc 100644 --- a/core/src/ch/asynk/rustanddust/ui/Scrollable.java +++ b/core/src/ch/asynk/rustanddust/ui/Scrollable.java @@ -46,6 +46,11 @@ public class Scrollable extends Widget return (child.getWidth() + (2 * padding)); } + public float getBestHeight() + { + return (child.getHeight() + (2 * padding)); + } + public boolean drag(float x, float y, int dx, int dy) { child.translate(0, dy); @@ -66,8 +71,8 @@ public class Scrollable extends Widget public void setPosition(float x, float y, float w, float h) { rect.set(x, y, w, h); - child.setPosition((x + padding), (getTop() - padding - child.getHeight())); - clip.set((getX() + padding), (getY() + padding), (getWidth() - (2 * padding)), (getHeight() - (2 * padding))); + child.setPosition((x + padding), (y + padding), (w - 2 * padding), (h - 2 * padding)); + clip.set((x + padding), (y + padding), (w - 2 * padding), (h - 2 * padding)); } @Override -- cgit v1.2.3