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

v0.6.4: wndItem now scales itself in landscape based on text size

Browse Source
This commit is contained in:
Evan Debenham 2018-04-01 14:14:56 -04:00
parent 394da27dbc
commit c496a53f02
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndItem.java
View File

@ -41,8 +41,8 @@ public class WndItem extends Window {
private static final float GAP = 2; private static final float GAP = 2;
private static final int WIDTH_P = 120; private static final int WIDTH_MIN = 120;
private static final int WIDTH_L = 144; private static final int WIDTH_MAX = 220;
public WndItem( final WndBag owner, final Item item ){ public WndItem( final WndBag owner, final Item item ){
this( owner, item, owner != null ); this( owner, item, owner != null );
@ -52,7 +52,18 @@ public class WndItem extends Window {
super(); super();
int width = SPDSettings.landscape() ? WIDTH_L : WIDTH_P; int width = WIDTH_MIN;
RenderedTextMultiline info = PixelScene.renderMultiline( item.info(), 6 );
info.maxWidth(width);
//info box can go out of the screen on landscape, so widen it
while (SPDSettings.landscape()
&& info.height() > 100
&& width < WIDTH_MAX){
width += 20;
info.maxWidth(width);
}
IconTitle titlebar = new IconTitle( item ); IconTitle titlebar = new IconTitle( item );
titlebar.setRect( 0, 0, width, 0 ); titlebar.setRect( 0, 0, width, 0 );
@ -64,8 +75,6 @@ public class WndItem extends Window {
titlebar.color( ItemSlot.DEGRADED ); titlebar.color( ItemSlot.DEGRADED );
} }
RenderedTextMultiline info = PixelScene.renderMultiline( item.info(), 6 );
info.maxWidth(width);
info.setPos(titlebar.left(), titlebar.bottom() + GAP); info.setPos(titlebar.left(), titlebar.bottom() + GAP);
add( info ); add( info );