# HG changeset patch # User Matti Hamalainen # Date 1489653913 -7200 # Node ID 9f04e8ab180a7db598f449b03922fa6b7644e1ea # Parent 9d3ff9605555bf60e761efb70df7cceec09aaaa9 Make widget positions relative to parent. Implementation might be incorrect, though. diff -r 9d3ff9605555 -r 9f04e8ab180a game/IDMWidget.java --- a/game/IDMWidget.java Thu Mar 16 10:44:38 2017 +0200 +++ b/game/IDMWidget.java Thu Mar 16 10:45:13 2017 +0200 @@ -87,32 +87,32 @@ public int getScaledX() { - return (int) (pos.x * scale.x); + return (int) (pos.x * scale.x) + (parent != null ? parent.getScaledX() : 0); } public int getScaledY() { - return (int) (pos.y * scale.y); + return (int) (pos.y * scale.y) + (parent != null ? parent.getScaledY() : 0); } public int getScaledX(float x) { - return (int) (x * scale.x); + return (int) (x * scale.x) + (parent != null ? parent.getScaledX() : 0); } public int getScaledY(float y) { - return (int) (y * scale.y); + return (int) (y * scale.y) + (parent != null ? parent.getScaledY() : 0); } public int getScaledRelX(float x) { - return (int) ((pos.x + x) * scale.x); + return (int) ((pos.x + x) * scale.x) + (parent != null ? parent.getScaledX() : 0); } public int getScaledRelY(float y) { - return (int) ((pos.y + y) * scale.y); + return (int) ((pos.y + y) * scale.y) + (parent != null ? parent.getScaledY() : 0); } public int getScaledWidth()