LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.7.5b: fixed various layout issues on different windows

Browse Source
This commit is contained in:
Evan Debenham 2019-10-13 13:05:50 -04:00
parent 29d45f0e41
commit dd78fe74a0
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoBuff.java
View File

@ -60,7 +60,7 @@ public class WndInfoBuff extends Window {
RenderedTextBlock txtInfo = PixelScene.renderTextBlock(buff.desc(), 6); RenderedTextBlock txtInfo = PixelScene.renderTextBlock(buff.desc(), 6);
txtInfo.maxWidth(WIDTH); txtInfo.maxWidth(WIDTH);
txtInfo.setPos(titlebar.left(), titlebar.bottom() + GAP); txtInfo.setPos(titlebar.left(), titlebar.bottom() + 2*GAP);
add( txtInfo ); add( txtInfo );
resize( WIDTH, (int)txtInfo.bottom() + 2 ); resize( WIDTH, (int)txtInfo.bottom() + 2 );

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoCell.java
View File

@ -117,8 +117,8 @@ public class WndInfoCell extends Window {
info.text( desc.length() == 0 ? Messages.get(this, "nothing") : desc ); info.text( desc.length() == 0 ? Messages.get(this, "nothing") : desc );
info.maxWidth(WIDTH); 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 );
} }
} }

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoMob.java
View File

@ -71,11 +71,11 @@ public class WndInfoMob extends WndTitledMessage {
image.y = Math.max( 0, name.height() + health.height() - image.height ); image.y = Math.max( 0, name.height() + health.height() - image.height );
name.setPos(x + image.width + GAP, 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; 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( buffs.setPos(
name.right() + GAP-1, name.right() + GAP-1,

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndLangs.java
View File

@ -116,7 +116,7 @@ public class WndLangs extends Window {
//language info layout. //language info layout.
RenderedTextBlock title = PixelScene.renderTextBlock( Messages.titleCase(currLang.nativeName()) , 9 ); 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); title.hardlight(TITLE_COLOR);
PixelScene.align(title); PixelScene.align(title);
add(title); add(title);

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStory.java
View File

@ -71,7 +71,7 @@ public class WndStory extends Window {
WIDTH_L - MARGIN * 2: WIDTH_L - MARGIN * 2:
WIDTH_P - MARGIN *2); WIDTH_P - MARGIN *2);
tf.invert(); tf.invert();
tf.setPos(MARGIN, 0); tf.setPos(MARGIN, 2);
add( tf ); add( tf );
add( new PointerArea( chrome ) { 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 @Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTitledMessage.java
View File

@ -51,7 +51,7 @@ public class WndTitledMessage extends Window {
RenderedTextBlock text = PixelScene.renderTextBlock( 6 ); RenderedTextBlock text = PixelScene.renderTextBlock( 6 );
text.text( message, width ); text.text( message, width );
text.setPos( titlebar.left(), titlebar.bottom() + GAP ); text.setPos( titlebar.left(), titlebar.bottom() + 2*GAP );
add( text ); add( text );
resize( width, (int)text.bottom() + 2 ); resize( width, (int)text.bottom() + 2 );