diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoBuff.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoBuff.java index 890e526ed..609b0b420 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoBuff.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoBuff.java @@ -60,7 +60,7 @@ public class WndInfoBuff extends Window { RenderedTextBlock txtInfo = PixelScene.renderTextBlock(buff.desc(), 6); txtInfo.maxWidth(WIDTH); - txtInfo.setPos(titlebar.left(), titlebar.bottom() + GAP); + txtInfo.setPos(titlebar.left(), titlebar.bottom() + 2*GAP); add( txtInfo ); resize( WIDTH, (int)txtInfo.bottom() + 2 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoCell.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoCell.java index 3132224fa..b82016c48 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoCell.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoCell.java @@ -117,8 +117,8 @@ public class WndInfoCell extends Window { info.text( desc.length() == 0 ? Messages.get(this, "nothing") : desc ); info.maxWidth(WIDTH); - info.setPos(titlebar.left(), titlebar.bottom() + GAP); + info.setPos(titlebar.left(), titlebar.bottom() + 2*GAP); - resize( WIDTH, (int)(info.top() + info.height()) ); + resize( WIDTH, (int)info.bottom()+2 ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoMob.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoMob.java index 777a9b565..e16ad8c42 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoMob.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoMob.java @@ -71,11 +71,11 @@ public class WndInfoMob extends WndTitledMessage { image.y = Math.max( 0, name.height() + health.height() - image.height ); name.setPos(x + image.width + GAP, - image.height > name.height() ? y +(name.height() - image.height()) / 2 : y); + image.height > name.height() ? y +(image.height() - name.height()) / 2 : y); float w = width - image.width - GAP; - health.setRect(image.width + GAP, name.bottom(), w, health.height()); + health.setRect(image.width + GAP, name.bottom() + GAP, w, health.height()); buffs.setPos( name.right() + GAP-1, diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndLangs.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndLangs.java index 53bc2957d..159476123 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndLangs.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndLangs.java @@ -116,7 +116,7 @@ public class WndLangs extends Window { //language info layout. RenderedTextBlock title = PixelScene.renderTextBlock( Messages.titleCase(currLang.nativeName()) , 9 ); - title.setPos( textLeft + (textWidth - title.width())/2f, 0 ); + title.setPos( textLeft + (textWidth - title.width())/2f, 2 ); title.hardlight(TITLE_COLOR); PixelScene.align(title); add(title); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStory.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStory.java index 2c199388d..e4d7ab44a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStory.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStory.java @@ -71,7 +71,7 @@ public class WndStory extends Window { WIDTH_L - MARGIN * 2: WIDTH_P - MARGIN *2); tf.invert(); - tf.setPos(MARGIN, 0); + tf.setPos(MARGIN, 2); add( tf ); add( new PointerArea( chrome ) { @@ -81,7 +81,7 @@ public class WndStory extends Window { } } ); - resize( (int)(tf.width() + MARGIN * 2), (int)Math.min( tf.height(), 180 ) ); + resize( (int)(tf.width() + MARGIN * 2), (int)Math.min( tf.height()+2, 180 ) ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTitledMessage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTitledMessage.java index d38d850e5..875968c94 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTitledMessage.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTitledMessage.java @@ -51,7 +51,7 @@ public class WndTitledMessage extends Window { RenderedTextBlock text = PixelScene.renderTextBlock( 6 ); text.text( message, width ); - text.setPos( titlebar.left(), titlebar.bottom() + GAP ); + text.setPos( titlebar.left(), titlebar.bottom() + 2*GAP ); add( text ); resize( width, (int)text.bottom() + 2 );