Skip to content

Commit 5a986ee

Browse files
committed
Inventory button style now in the inventoryui style to allow custom style by player.
1 parent 3c9a28c commit 5a986ee

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

blade-engine/src/com/bladecoder/engine/ui/AnimButton.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ public AnimButton(Skin skin, String styleName) {
88
super(skin, styleName);
99
}
1010

11+
public AnimButton(ButtonStyle style) {
12+
super(style);
13+
}
14+
1115
@Override
1216
public void act(float delta) {
1317
ButtonStyle style = getStyle();

blade-engine/src/com/bladecoder/engine/ui/InventoryButton.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
77
import com.bladecoder.engine.model.World;
88
import com.bladecoder.engine.ui.InventoryUI.InventoryPos;
9+
import com.bladecoder.engine.ui.InventoryUI.InventoryUIStyle;
910
import com.bladecoder.engine.util.DPIUtils;
1011

1112
public class InventoryButton extends AnimButton {
@@ -15,8 +16,19 @@ public class InventoryButton extends AnimButton {
1516

1617
private int numItems = Integer.MAX_VALUE;
1718

19+
private static ButtonStyle getDefaultStyle(Skin skin) {
20+
InventoryUIStyle inventoryUIStyle = skin.get(InventoryUIStyle.class);
21+
ButtonStyle inventoryButtonStyle = inventoryUIStyle.inventoryButtonStyle;
22+
23+
if (inventoryButtonStyle == null) {
24+
inventoryButtonStyle = skin.get("inventory", ButtonStyle.class);
25+
}
26+
27+
return inventoryButtonStyle;
28+
}
29+
1830
public InventoryButton(Skin skin, World w, InventoryUI inv) {
19-
super(skin, "inventory");
31+
super(getDefaultStyle(skin));
2032
this.inventory = inv;
2133
this.world = w;
2234

blade-engine/src/com/bladecoder/engine/ui/InventoryUI.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import com.badlogic.gdx.scenes.scene2d.InputListener;
2727
import com.badlogic.gdx.scenes.scene2d.actions.Actions;
2828
import com.badlogic.gdx.scenes.scene2d.ui.Button;
29-
import com.badlogic.gdx.scenes.scene2d.ui.ImageButton.ImageButtonStyle;
29+
import com.badlogic.gdx.scenes.scene2d.ui.Button.ButtonStyle;
3030
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
3131
import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
3232
import com.bladecoder.engine.model.ActorRenderer;
@@ -368,7 +368,8 @@ static public class InventoryUIStyle {
368368
public Drawable background;
369369
/** Optional. */
370370
public Drawable itemBackground;
371-
public ImageButtonStyle menuButtonStyle;
371+
public ButtonStyle menuButtonStyle;
372+
public ButtonStyle inventoryButtonStyle;
372373

373374
public InventoryUIStyle() {
374375
}
@@ -377,6 +378,7 @@ public InventoryUIStyle(InventoryUIStyle style) {
377378
background = style.background;
378379
menuButtonStyle = style.menuButtonStyle;
379380
itemBackground = style.itemBackground;
381+
inventoryButtonStyle = style.inventoryButtonStyle;
380382
}
381383
}
382384
}

0 commit comments

Comments
 (0)