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

Merging 1.9.1 source: tweaked welcome scene to make use of the new scrollbar

Browse Source
This commit is contained in:
Evan Debenham 2015-11-10 04:13:07 -05:00
parent 3fdd6452db
commit bd4decc6b7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java
View File

@ -156,12 +156,6 @@ public class WelcomeScene extends PixelScene {
ScrollPane list = new ScrollPane( new Component() ); ScrollPane list = new ScrollPane( new Component() );
add( list ); add( list );
list.setRect(
panel.x + panel.marginLeft(),
panel.y + panel.marginTop(),
panel.innerWidth(),
panel.innerHeight());
list.scrollTo( 0, 0 );
Component content = list.content(); Component content = list.content();
content.clear(); content.clear();
@ -173,6 +167,13 @@ public class WelcomeScene extends PixelScene {
content.setSize( panel.innerWidth(), text.height() ); content.setSize( panel.innerWidth(), text.height() );
list.setRect(
panel.x + panel.marginLeft(),
panel.y + panel.marginTop(),
panel.innerWidth(),
panel.innerHeight());
list.scrollTo(0, 0);
RedButton okay = new RedButton("Okay!") { RedButton okay = new RedButton("Okay!") {
@Override @Override
protected void onClick() { protected void onClick() {