diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/cleric/Trinity.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/cleric/Trinity.java index 1c2a7067e..a1759c45c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/cleric/Trinity.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/cleric/Trinity.java @@ -55,6 +55,7 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.ui.HeroIcon; +import com.shatteredpixel.shatteredpixeldungeon.ui.ItemButton; import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton; import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; import com.shatteredpixel.shatteredpixeldungeon.ui.Window; @@ -355,13 +356,14 @@ public class Trinity extends ArmorAbility { int left = 0; for (Item item : options){ - RedButton btn = new RedButton(""){ + ItemButton btn = new ItemButton(){ @Override protected void onClick() { GameScene.show(new WndItemConfirm(WndItemtypeSelect.this, item, tome, spell)); } }; - btn.icon(new ItemSprite(item)); + btn.item(item); + btn.slot().textVisible(false); btn.setRect(left, top, 19, 19); add(btn); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemButton.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemButton.java index 24b3fa7b1..f033704fe 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemButton.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemButton.java @@ -101,4 +101,8 @@ public class ItemButton extends Component { slot.clear(); } + public ItemSlot slot(){ + return slot; + } + } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java index 44735fdd1..6cfc68843 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java @@ -326,6 +326,18 @@ public class ItemSlot extends Button { } + public void textVisible( boolean visible ){ + if (visible){ + add(status); + add(extra); + add(level); + } else { + remove(status); + remove(extra); + remove(level); + } + } + public void setMargins( int left, int top, int right, int bottom){ margin.set(left, top, right, bottom); layout();