v0.3.0: added functionality for full buff descriptions (need to write them still)

src/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java

@@ -37,6 +37,7 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
 import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton;
 import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
+import com.watabou.noosa.ui.Button;
 
 public class WndHero extends WndTabbed {
 	
@@ -180,32 +181,55 @@ public class WndHero extends WndTabbed {
 		
 		public BuffsTab() {
 			for (Buff buff : Dungeon.hero.buffs()) {
-				buffSlot( buff );
-			}
-		}
-		
-		private void buffSlot( Buff buff ) {
-			
-			int index = buff.icon();
-			
-			if (index != BuffIndicator.NONE) {
-				
-				Image icon = new Image( icons );
-				icon.frame( film.get( index ) );
-				icon.y = pos;
-				add( icon );
-				
-				BitmapText txt = PixelScene.createText( buff.toString(), 8 );
-				txt.x = icon.width + GAP;
-				txt.y = pos + (int)(icon.height - txt.baseLine()) / 2;
-				add( txt );
-				
-				pos += GAP + icon.height;
+				if (buff.icon() != BuffIndicator.NONE) {
+					BuffSlot slot = new BuffSlot(buff);
+					slot.setRect(0, pos, WIDTH, slot.icon.height());
+					add(slot);
+					pos += GAP + slot.height();
+				}
 			}
 		}
 		
 		public float height() {
 			return pos;
 		}
+
+		private class BuffSlot extends Button{
+
+			private Buff buff;
+
+			Image icon;
+			BitmapText txt;
+
+			public BuffSlot( Buff buff ){
+				super();
+				this.buff = buff;
+				int index = buff.icon();
+
+				icon = new Image( icons );
+				icon.frame( film.get( index ) );
+				icon.y = this.y;
+				add( icon );
+
+				txt = PixelScene.createText( buff.toString(), 8 );
+				txt.x = icon.width + GAP;
+				txt.y = this.y + (int)(icon.height - txt.baseLine()) / 2;
+				add( txt );
+
+			}
+
+			@Override
+			protected void layout() {
+				super.layout();
+				icon.y = this.y;
+				txt.x = icon.width + GAP;
+				txt.y = pos + (int)(icon.height - txt.baseLine()) / 2;
+			}
+
+			@Override
+			protected void onClick() {
+				GameScene.show( new WndInfoBuff( buff ));
+			}
+		}
 	}
 }

src/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoBuff.java

@@ -0,0 +1,51 @@
+package com.shatteredpixel.shatteredpixeldungeon.windows;
+
+import com.shatteredpixel.shatteredpixeldungeon.Assets;
+import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
+import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
+import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
+import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
+import com.watabou.gltextures.SmartTexture;
+import com.watabou.gltextures.TextureCache;
+import com.watabou.noosa.BitmapTextMultiline;
+import com.watabou.noosa.Image;
+import com.watabou.noosa.TextureFilm;
+
+/**
+ * Created by debenhame on 06/04/2015.
+ */
+public class WndInfoBuff extends Window {
+
+	private static final float GAP	= 2;
+
+	private static final int WIDTH = 120;
+
+	private SmartTexture icons;
+	private TextureFilm film;
+
+	public WndInfoBuff(Buff buff){
+		super();
+
+		IconTitle titlebar = new IconTitle();
+
+		icons = TextureCache.get( Assets.BUFFS_LARGE );
+		film = new TextureFilm( icons, 16, 16 );
+
+		Image buffIcon = new Image( icons );
+		buffIcon.frame( film.get(buff.icon()) );
+
+		titlebar.icon( buffIcon );
+		titlebar.label( Utils.capitalize(buff.toString()), Window.TITLE_COLOR );
+		titlebar.setRect( 0, 0, WIDTH, 0 );
+		add( titlebar );
+
+		BitmapTextMultiline txtInfo = PixelScene.createMultiline(buff.desc(), 6);
+		txtInfo.maxWidth = WIDTH;
+		txtInfo.measure();
+		txtInfo.x = titlebar.left();
+		txtInfo.y = titlebar.bottom() + GAP;
+		add( txtInfo );
+
+		resize( WIDTH, (int)(txtInfo.y + txtInfo.height()) );
+	}
+}