From 3bb048a19dcf4727731b50c3ddf555c5d58de9a5 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 5 Feb 2021 12:59:55 -0500 Subject: [PATCH] v0.9.2: more tweaks to WndGameInProgress, added an icon to WndInfoTalent --- .../shatteredpixeldungeon/windows/WndGameInProgress.java | 6 +++--- .../shatteredpixeldungeon/windows/WndInfoTalent.java | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java index 9ab8c97dc..d1fd338c9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java @@ -156,14 +156,14 @@ public class WndGameInProgress extends Window { }; cont.icon(Icons.get(Icons.ENTER)); - cont.setRect(0, pos, WIDTH/2 -1, 18); + cont.setRect(0, pos, WIDTH/2 -1, 20); add(cont); erase.icon(Icons.get(Icons.CLOSE)); - erase.setRect(WIDTH/2 + 1, pos, WIDTH/2 - 1, 18); + erase.setRect(WIDTH/2 + 1, pos, WIDTH/2 - 1, 20); add(erase); - resize(WIDTH, (int)cont.bottom()); + resize(WIDTH, (int)cont.bottom()+1); } private void statSlot( String label, String value ) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoTalent.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoTalent.java index 807c70aab..c92895870 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoTalent.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoTalent.java @@ -25,6 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; import com.shatteredpixel.shatteredpixeldungeon.ui.RenderedTextBlock; import com.shatteredpixel.shatteredpixeldungeon.ui.Window; @@ -79,7 +80,8 @@ public class WndInfoTalent extends Window { onUpgradeButton.call(); } }; - upgrade.setRect(0, txtInfo.bottom() + 2*GAP, WIDTH, 16); + upgrade.icon(Icons.get(Icons.TALENT)); + upgrade.setRect(0, txtInfo.bottom() + 2*GAP, WIDTH, 18); add(upgrade); resize( WIDTH, (int)upgrade.bottom()+1 ); }