From 2367283bf603af1fbd6d498fc5b4b4f8ea405cc2 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 24 Apr 2015 02:44:01 -0400 Subject: [PATCH] v0.3.0: Added shading to the toolbar, and slightly repositioned it. --- assets/toolbar.png | Bin 3293 -> 4071 bytes .../shatteredpixeldungeon/ui/Toolbar.java | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/toolbar.png b/assets/toolbar.png index 95af8cf6a716cd39c4f0ea3f8e3eabb7303d8c76..59f251ed3de8528a12558cc72747c99502eb82a3 100644 GIT binary patch delta 4041 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 literal 3293 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 bpe$FP1R)D_9%9Y!00000NkvXXu0mjf@^Ate diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java index a3c18faa1..30f22a2bf 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java @@ -72,7 +72,7 @@ public class Toolbar extends Component { @Override protected void createChildren() { - add( btnWait = new Tool( 0, 7, 20, 24 ) { + add( btnWait = new Tool( 0, 7, 20, 25 ) { @Override protected void onClick() { Dungeon.hero.rest( false ); @@ -83,14 +83,14 @@ public class Toolbar extends Component { }; } ); - add( btnSearch = new Tool( 20, 7, 20, 24 ) { + add( btnSearch = new Tool( 20, 7, 20, 25 ) { @Override protected void onClick() { Dungeon.hero.search( true ); } } ); - add( btnInfo = new Tool( 40, 7, 21, 24 ) { + add( btnInfo = new Tool( 40, 7, 21, 25 ) { @Override protected void onClick() { GameScene.selectCell( informer ); @@ -106,7 +106,7 @@ public class Toolbar extends Component { } ); */ - add( btnInventory = new Tool( 82, 7, 23, 24 ) { + add( btnInventory = new Tool( 82, 7, 23, 25 ) { private GoldIndicator gold; @Override protected void onClick() { @@ -129,9 +129,9 @@ public class Toolbar extends Component { }; } ); - add( btnQuick = new QuickslotTool( 105, 7, 22, 24, 0) ); + add( btnQuick = new QuickslotTool( 105, 7, 22, 25, 0) ); - btnQuick2 = new QuickslotTool( 105, 7, 22, 24, 1); + btnQuick2 = new QuickslotTool( 105, 7, 22, 25, 1); add( pickedUp = new PickedUpItem() ); }