From bd4decc6b711876ff6e23f2feb3aca6d71c6395c Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Tue, 10 Nov 2015 04:13:07 -0500
Subject: [PATCH] Merging 1.9.1 source: tweaked welcome scene to make use of
 the new scrollbar

---
 .../shatteredpixeldungeon/scenes/WelcomeScene.java  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java
index abfff0c15..dd92c3fcd 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java
@@ -156,12 +156,6 @@ public class WelcomeScene extends PixelScene {
 
 		ScrollPane list = new ScrollPane( new Component() );
 		add( list );
-		list.setRect(
-				panel.x + panel.marginLeft(),
-				panel.y + panel.marginTop(),
-				panel.innerWidth(),
-				panel.innerHeight());
-		list.scrollTo( 0, 0 );
 
 		Component content = list.content();
 		content.clear();
@@ -173,6 +167,13 @@ public class WelcomeScene extends PixelScene {
 
 		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!") {
 			@Override
 			protected void onClick() {