diff --git a/core/src/main/assets/interfaces/chrome.png b/core/src/main/assets/interfaces/chrome.png index 53d4169a5..2b567b38b 100644 Binary files a/core/src/main/assets/interfaces/chrome.png and b/core/src/main/assets/interfaces/chrome.png differ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Chrome.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Chrome.java index d81902029..e6e085119 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Chrome.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Chrome.java @@ -28,6 +28,7 @@ public class Chrome { public enum Type { TOAST, TOAST_TR, + TOAST_TR_HEAVY, TOAST_WHITE, WINDOW, WINDOW_SILVER, @@ -55,6 +56,8 @@ public class Chrome { case TOAST_TR: case GREY_BUTTON_TR: return new NinePatch( Asset, 20, 9, 9, 9, 4 ); + case TOAST_TR_HEAVY: + return new NinePatch( Asset, 29, 9, 9, 9, 4 ); case TOAST_WHITE: return new NinePatch( Asset, 29, 0, 9, 9, 4 ); case RED_BUTTON: diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java index 2480c3b1d..2bb7ffb83 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java @@ -114,12 +114,9 @@ public class InventoryPane extends Component { @Override protected void createChildren() { - bg = Chrome.get(Chrome.Type.TOAST_TR); + bg = Chrome.get(Chrome.Type.TOAST_TR_HEAVY); add(bg); - bg2 = Chrome.get(Chrome.Type.TOAST_TR); - add(bg2); - blocker = new PointerArea(0, 0, PixelScene.uiCamera.width, PixelScene.uiCamera.height){ @Override protected void onClick(PointerEvent event) { @@ -211,10 +208,9 @@ public class InventoryPane extends Component { width = WIDTH; height = HEIGHT; - bg.x = bg2.x = x; - bg.y = bg2.y = y; + bg.x = x; + bg.y = y; bg.size(width, height); - bg2.size(width, height); float left = x+4; for (InventorySlot i : equipped){ @@ -264,7 +260,6 @@ public class InventoryPane extends Component { public void alpha( float value ){ bg.alpha( value ); - bg2.alpha( value ); for (InventorySlot slot : equipped){ slot.alpha( value ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/RightClickMenu.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/RightClickMenu.java index 8d6d82707..256be8ba3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/RightClickMenu.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/RightClickMenu.java @@ -64,7 +64,7 @@ public class RightClickMenu extends Component { } private void setup(Image icon, String title, String... options){ - bg = Chrome.get(Chrome.Type.TOAST_TR); + bg = Chrome.get(Chrome.Type.TOAST_TR_HEAVY); add(bg); this.icon = icon; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Tooltip.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Tooltip.java index be0fb3105..49c8ecbf6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Tooltip.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Tooltip.java @@ -73,7 +73,7 @@ public class Tooltip extends Component { protected void createChildren() { super.createChildren(); - bg = Chrome.get(Chrome.Type.TOAST_TR); + bg = Chrome.get(Chrome.Type.TOAST_TR_HEAVY); add(bg); text = PixelScene.renderTextBlock(6);