Merging 1.7.5 Source: ui changes

2015-01-30 14:05:10 -05:00
parent 4499685b09
commit 894f7d9d06
9 changed files with 148 additions and 37 deletions
@@ -1,6 +1,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.ui;

 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
+import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
 import com.watabou.noosa.Image;

 /**
@@ -22,15 +23,17 @@ public class ResumeIndicator extends Tag {
    @Override
    protected void createChildren() {
        super.createChildren();
-        icon = Icons.get(Icons.RESUME);
-        add(icon);
+
+        icon = Icons.get( Icons.RESUME );
+        add( icon );
    }

    @Override
    protected void layout() {
        super.layout();
-        icon.x = x + (width - icon.width()) / 2;
-        icon.y = y + (height - icon.height()) / 2;
+
+        icon.x = PixelScene.align( PixelScene.uiCamera, x+1 + (width - icon.width) / 2 );
+        icon.y = PixelScene.align( PixelScene.uiCamera, y + (height - icon.height) / 2 );
    }

    @Override