LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.2.3e: tied toolbar UI into quickslot settings (need to move 'continue' button to a tag)

Browse Source
This commit is contained in:
Evan Debenham 2015-01-21 16:13:54 -05:00
parent f0fb0beb1a
commit 02693eef4d
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java
View File

@ -17,6 +17,7 @@
*/ */
package com.shatteredpixel.shatteredpixeldungeon.ui; package com.shatteredpixel.shatteredpixeldungeon.ui;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.watabou.noosa.Game; import com.watabou.noosa.Game;
import com.watabou.noosa.Gizmo; import com.watabou.noosa.Gizmo;
import com.watabou.noosa.Image; import com.watabou.noosa.Image;
@ -52,6 +53,9 @@ public class Toolbar extends Component {
private Tool btnResume; private Tool btnResume;
private Tool btnInventory; private Tool btnInventory;
private Tool btnQuick; private Tool btnQuick;
private Tool btnQuick2;
public static int QuickSlots;
private PickedUpItem pickedUp; private PickedUpItem pickedUp;
@ -60,6 +64,8 @@ public class Toolbar extends Component {
public Toolbar() { public Toolbar() {
super(); super();
QuickSlots = ShatteredPixelDungeon.quickSlots();
height = btnInventory.height(); height = btnInventory.height();
} }
@ -121,7 +127,9 @@ public class Toolbar extends Component {
}; };
} ); } );
add( btnQuick = new QuickslotTool( 105, 7, 22, 24 ) ); add( btnQuick = new QuickslotTool( 105, 7, 22, 24, 0) );
add( btnQuick2 = new QuickslotTool( 105, 7, 22, 24, 1)) ;
add( pickedUp = new PickedUpItem() ); add( pickedUp = new PickedUpItem() );
} }
@ -133,7 +141,14 @@ public class Toolbar extends Component {
btnInfo.setPos( btnSearch.right(), y ); btnInfo.setPos( btnSearch.right(), y );
btnResume.setPos( btnInfo.right(), y ); btnResume.setPos( btnInfo.right(), y );
btnQuick.setPos( width - btnQuick.width(), y ); btnQuick.setPos( width - btnQuick.width(), y );
btnInventory.setPos( btnQuick.left() - btnInventory.width(), y ); btnQuick2.setPos( btnQuick.left() - btnQuick2.width(), y );
if (QuickSlots == 2){
btnQuick2.visible = btnQuick2.active = true;
btnInventory.setPos( btnQuick2.left() - btnInventory.width(), y );
} else {
btnQuick2.visible = btnQuick2.active = false;
btnInventory.setPos( btnQuick.left() - btnInventory.width(), y );
}
} }
@Override @Override
@ -155,6 +170,11 @@ public class Toolbar extends Component {
if (!Dungeon.hero.isAlive()) { if (!Dungeon.hero.isAlive()) {
btnInventory.enable( true ); btnInventory.enable( true );
} }
//If we have 2 slots, and 2nd one isn't visible, or we have 1, and 2nd one is visible...
if ((QuickSlots == 1) == btnQuick2.visible){
layout();
}
} }
public void pickup( Item item ) { public void pickup( Item item ) {
@ -276,16 +296,9 @@ public class Toolbar extends Component {
private static class QuickslotTool extends Tool { private static class QuickslotTool extends Tool {
private QuickSlotButton slot; private QuickSlotButton slot;
private int slotNum;
public QuickslotTool( int x, int y, int width, int height, int slotNum ) { public QuickslotTool( int x, int y, int width, int height, int slotNum ) {
super( x, y, width, height ); super( x, y, width, height );
this.slotNum = slotNum;
}
@Override
protected void createChildren() {
super.createChildren();
slot = new QuickSlotButton( slotNum ); slot = new QuickSlotButton( slotNum );
add( slot ); add( slot );
@ -299,8 +312,8 @@ public class Toolbar extends Component {
@Override @Override
public void enable( boolean value ) { public void enable( boolean value ) {
super.enable( value );
slot.enable( value ); slot.enable( value );
active = value;
} }
} }

2
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java
View File

@ -18,6 +18,7 @@
package com.shatteredpixel.shatteredpixeldungeon.windows; package com.shatteredpixel.shatteredpixeldungeon.windows;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.shatteredpixel.shatteredpixeldungeon.ui.Toolbar;
import com.watabou.noosa.Camera; import com.watabou.noosa.Camera;
import com.watabou.noosa.audio.Sample; import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
@ -168,6 +169,7 @@ public class WndSettings extends Window {
protected void onClick() { protected void onClick() {
super.onClick(); super.onClick();
ShatteredPixelDungeon.quickSlots(checked() ? 2 : 1); ShatteredPixelDungeon.quickSlots(checked() ? 2 : 1);
Toolbar.QuickSlots = checked() ? 2 : 1;
} }
}; };
btnQuickSlot.setRect( 0, btnBrightness.bottom() + GAP, WIDTH, BTN_HEIGHT ); btnQuickSlot.setRect( 0, btnBrightness.bottom() + GAP, WIDTH, BTN_HEIGHT );