konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.2.4: tweaked some windows

Browse Source
This commit is contained in:
Evan Debenham
2015-02-21 21:07:30 -05:00
parent 9c5d4facf5
commit 810ce1b8e4
2 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoPlant.java
+2 -25
View File
@@ -17,37 +17,14 @@
*/ */
package com.shatteredpixel.shatteredpixeldungeon.windows; package com.shatteredpixel.shatteredpixeldungeon.windows;
import com.watabou.noosa.BitmapTextMultiline;
import com.shatteredpixel.shatteredpixeldungeon.plants.Plant; import com.shatteredpixel.shatteredpixeldungeon.plants.Plant;
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.PlantSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.PlantSprite;
import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
public class WndInfoPlant extends Window { public class WndInfoPlant extends WndTitledMessage {
private static final float GAP = 2;
private static final int WIDTH = 120;
public WndInfoPlant( Plant plant ) { public WndInfoPlant( Plant plant ) {
super(); super(new PlantSprite( plant.image ), plant.plantName, plant.desc());
IconTitle titlebar = new IconTitle();
titlebar.icon( new PlantSprite( plant.image ) );
titlebar.label( plant.plantName );
titlebar.setRect( 0, 0, WIDTH, 0 );
add( titlebar );
BitmapTextMultiline info = PixelScene.createMultiline( 6 );
add( info );
info.text( plant.desc() );
info.maxWidth = WIDTH;
info.measure();
info.x = titlebar.left();
info.y = titlebar.bottom() + GAP;
resize( WIDTH, (int)(info.y + info.height()) );
} }
} }
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndStory.java
+7 -3
View File
@@ -17,6 +17,7 @@
*/ */
package com.shatteredpixel.shatteredpixeldungeon.windows; package com.shatteredpixel.shatteredpixeldungeon.windows;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.watabou.input.Touchscreen.Touch; import com.watabou.input.Touchscreen.Touch;
import com.watabou.noosa.BitmapTextMultiline; import com.watabou.noosa.BitmapTextMultiline;
import com.watabou.noosa.Game; import com.watabou.noosa.Game;
@@ -29,8 +30,9 @@ import com.watabou.utils.SparseArray;
public class WndStory extends Window { public class WndStory extends Window {
private static final int WIDTH = 120; private static final int WIDTH_P = 120;
private static final int MARGIN = 6; private static final int WIDTH_L = 144;
private static final int MARGIN = 6;
private static final float bgR = 0.77f; private static final float bgR = 0.77f;
private static final float bgG = 0.73f; private static final float bgG = 0.73f;
@@ -83,7 +85,9 @@ public class WndStory extends Window {
super( 0, 0, Chrome.get( Chrome.Type.SCROLL ) ); super( 0, 0, Chrome.get( Chrome.Type.SCROLL ) );
tf = PixelScene.createMultiline( text, 7 ); tf = PixelScene.createMultiline( text, 7 );
tf.maxWidth = WIDTH - MARGIN * 2; tf.maxWidth = ShatteredPixelDungeon.landscape() ?
WIDTH_L - MARGIN * 2:
WIDTH_P - MARGIN *2;
tf.measure(); tf.measure();
tf.ra = bgR; tf.ra = bgR;
tf.ga = bgG; tf.ga = bgG;