v0.3.4: implemented rendered text in all single-line cases

src/com/shatteredpixel/shatteredpixeldungeon/ui/BadgesList.java

@@ -22,9 +22,9 @@ package com.shatteredpixel.shatteredpixeldungeon.ui;
 
 import java.util.ArrayList;
 
-import com.watabou.noosa.BitmapText;
 import com.watabou.noosa.Game;
 import com.watabou.noosa.Image;
+import com.watabou.noosa.RenderedText;
 import com.watabou.noosa.audio.Sample;
 import com.watabou.noosa.ui.Component;
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
@@ -85,7 +85,7 @@ public class BadgesList extends ScrollPane {
 		private Badges.Badge badge;
 		
 		private Image icon;
-		private BitmapText label;
+		private RenderedText label;
 		
 		public ListItem( Badges.Badge badge ) {
 			super();
@@ -100,7 +100,7 @@ public class BadgesList extends ScrollPane {
 			icon = new Image();
 			add( icon );
 			
-			label = PixelScene.createText( 6 );
+			label = PixelScene.renderText( 6 );
 			add( label );
 		}
 		

src/com/shatteredpixel/shatteredpixeldungeon/ui/OptionSlider.java

@@ -34,9 +34,9 @@ public abstract class OptionSlider extends Component {
 
 	private TouchArea touchArea;
 
-	private BitmapText title;
-	private BitmapText minTxt;
-	private BitmapText maxTxt;
+	private RenderedText title;
+	private RenderedText minTxt;
+	private RenderedText maxTxt;
 
 	//values are expressed internally as ints, but they can easily be interpreted as something else externally.
 	private int minVal;
@@ -54,11 +54,8 @@ public abstract class OptionSlider extends Component {
 		super();
 
 		this.title.text(title);
-		this.title.measure();
 		this.minTxt.text(minTxt);
-		this.minTxt.measure();
 		this.maxTxt.text(maxTxt);
-		this.maxTxt.measure();
 
 		this.minVal = minVal;
 		this.maxVal = maxVal;
@@ -95,9 +92,9 @@ public abstract class OptionSlider extends Component {
 		add( BG = Chrome.get(Chrome.Type.BUTTON));
 		BG.alpha(0.5f);
 
-		add(title = PixelScene.createText(9));
-		add(this.minTxt = PixelScene.createText(6));
-		add(this.maxTxt = PixelScene.createText(6));
+		add(title = PixelScene.renderText(9));
+		add(this.minTxt = PixelScene.renderText(6));
+		add(this.maxTxt = PixelScene.renderText(6));
 
 		add(sliderBG = new ColorBlock(1, 1, 0xFF222222));
 		sliderNode = Chrome.get(Chrome.Type.BUTTON);

src/com/shatteredpixel/shatteredpixeldungeon/ui/RedButton.java

@@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.ui;
 import com.watabou.noosa.BitmapText;
 import com.watabou.noosa.Image;
 import com.watabou.noosa.NinePatch;
+import com.watabou.noosa.RenderedText;
 import com.watabou.noosa.audio.Sample;
 import com.watabou.noosa.ui.Button;
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
@@ -32,14 +33,13 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
 public class RedButton extends Button {
 	
 	protected NinePatch bg;
-	protected BitmapText text;
+	protected RenderedText text;
 	protected Image icon;
 			
 	public RedButton( String label ) {
 		super();
 		
 		text.text( label );
-		text.measure();
 	}
 	
 	@Override
@@ -49,7 +49,7 @@ public class RedButton extends Button {
 		bg = Chrome.get( Chrome.Type.BUTTON );
 		add( bg );
 		
-		text = PixelScene.createText( 9 );
+		text = PixelScene.renderText( 9 );
 		add( text );
 	}
 	
@@ -89,7 +89,6 @@ public class RedButton extends Button {
 	
 	public void text( String value ) {
 		text.text( value );
-		text.measure();
 		layout();
 	}