Mercurial > hg > ristipolku

changeset 177:9f04e8ab180a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make widget positions relative to parent. Implementation might be incorrect, though.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 16 Mar 2017 10:45:13 +0200
parents 9d3ff9605555
children 981a8e20b363
files game/IDMWidget.java
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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()