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

Merging Source v1.7.2: scene changes

Browse Source
This commit is contained in:
Evan Debenham
2014-10-18 04:56:57 -04:00
parent c976144fdf
commit 9f9e117c95
12 changed files with 482 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/scenes/BadgesScene.java
+9 -4
View File
@@ -19,14 +19,15 @@ package com.shatteredpixel.shatteredpixeldungeon.scenes;
import com.watabou.noosa.BitmapText;
import com.watabou.noosa.Camera;
import com.watabou.noosa.Game;
import com.watabou.noosa.NinePatch;
import com.watabou.noosa.audio.Music;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Badges;
import com.shatteredpixel.shatteredpixeldungeon.Chrome;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.shatteredpixel.shatteredpixeldungeon.ui.Archs;
import com.shatteredpixel.shatteredpixeldungeon.ui.BadgesList;
import com.shatteredpixel.shatteredpixeldungeon.ui.ExitButton;
import com.shatteredpixel.shatteredpixeldungeon.ui.ScrollPane;
import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
@@ -51,8 +52,8 @@ public class BadgesScene extends PixelScene {
archs.setSize( w, h );
add( archs );
int pw = Math.min( 160, w - 10 );
int ph = h - 24;
int pw = Math.min( 160, w - 6 );
int ph = h - 30;
NinePatch panel = Chrome.get( Chrome.Type.WINDOW );
panel.size( pw, ph );
@@ -77,12 +78,16 @@ public class BadgesScene extends PixelScene {
panel.y + panel.marginTop(),
panel.innerWidth(),
panel.innerHeight() );
ExitButton btnExit = new ExitButton();
btnExit.setPos( Camera.main.width - btnExit.width(), 0 );
add( btnExit );
fadeIn();
}
@Override
protected void onBackPressed() {
Game.switchScene( TitleScene.class );
ShatteredPixelDungeon.switchNoFade(TitleScene.class);
}
}