v0.8.1: bags now appear again in their own bag window

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/MagicalHolster.java

@@ -45,6 +45,10 @@ public class MagicalHolster extends Bag {
 		}
 	}
 
+	public int capacity(){
+		return 19;
+	}
+	
 	@Override
 	public boolean collect( Bag container ) {
 		if (super.collect( container )) {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/PotionBandolier.java

@@ -43,6 +43,10 @@ public class PotionBandolier extends Bag {
 		}
 	}
 
+	public int capacity(){
+		return 19;
+	}
+
 	@Override
 	public int price() {
 		return 40;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java

@@ -45,6 +45,10 @@ public class ScrollHolder extends Bag {
 		}
 	}
 
+	public int capacity(){
+		return 19;
+	}
+	
 	@Override
 	public void onDetach( ) {
 		super.onDetach();

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/VelvetPouch.java

@@ -46,6 +46,10 @@ public class VelvetPouch extends Bag {
 		}
 	}
 
+	public int capacity(){
+		return 19;
+	}
+	
 	@Override
 	public int price() {
 		return 30;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java

@@ -221,9 +221,19 @@ public class WndBag extends WndTabbed {
 		placeItem( stuff.misc1 != null ? stuff.misc1 : new Placeholder( ItemSpriteSheet.RING_HOLDER ) );
 		placeItem( stuff.misc2 != null ? stuff.misc2 : new Placeholder( ItemSpriteSheet.RING_HOLDER ) );
 
-		// Items in the bag
+		//the container itself if it's not the root backpack
+		if (container != Dungeon.hero.belongings.backpack){
+			placeItem(container);
+			count--; //don't count this one, as it's not actually inside of itself
+		}
+
+		// Items in the bag, except other containers (they have tags at the bottom)
 		for (Item item : container.items.toArray(new Item[0])) {
-			placeItem( item );
+			if (!(item instanceof Bag)) {
+				placeItem( item );
+			} else {
+				count++;
+			}
 		}
 		
 		// Free Space
@@ -236,8 +246,6 @@ public class WndBag extends WndTabbed {
 
 		count++;
 		
-		if (item instanceof Bag) return;
-		
 		int x = col * (SLOT_WIDTH + SLOT_MARGIN);
 		int y = TITLE_HEIGHT + row * (SLOT_HEIGHT + SLOT_MARGIN);
 		
@@ -346,7 +354,7 @@ public class WndBag extends WndTabbed {
 			super( item );
 
 			this.item = item;
-			if (item instanceof Gold) {
+			if (item instanceof Gold || item instanceof Bag) {
 				bg.visible = false;
 			}
 			
@@ -433,7 +441,7 @@ public class WndBag extends WndTabbed {
 		
 		@Override
 		protected void onClick() {
-			if (!lastBag.contains(item) && !item.isEquipped(Dungeon.hero)){
+			if (lastBag != item && !lastBag.contains(item) && !item.isEquipped(Dungeon.hero)){
 
 				hide();