From c01760a394e4b8c25e39a4e49af9ebf2812627f5 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 13 Nov 2024 15:11:32 -0500 Subject: [PATCH] v3.0.0: added a new 'heavy' transparent toast chrome used for tooltips, inventory pane, and right click menus --- core/src/main/assets/interfaces/chrome.png | Bin 1153 -> 1186 bytes .../shatteredpixeldungeon/Chrome.java | 3 +++ .../ui/InventoryPane.java | 11 +++-------- .../ui/RightClickMenu.java | 2 +- .../shatteredpixeldungeon/ui/Tooltip.java | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/core/src/main/assets/interfaces/chrome.png b/core/src/main/assets/interfaces/chrome.png index 53d4169a5c3a38cb06677b1b0f9a48261753b131..2b567b38b19a578d147c1094f69c6babfdb3ffb0 100644 GIT binary patch delta 926 zcmV;P17ZAu38D#*BmwG?C2$NmJ2g8!H#Q%eEWk&AgX;%~dVxnvFAyyj zczRBVw6cGNpD2~(s|8+8tQCODa4vj>RG%j>7(|~eFdRfr&q}4AD3GRgU7JDFGz}I| zA@GR;b=}rA2{cXDG$=rPszCeN8iDSu`wRig#!tYqUVsqN(nmj4bzPf5)ZqEE0uCz& z5xP@Y)F zV6icJcY$@7>j4+aya4b-?;kF!1^WH(K$#avTL)*baKbzZm>)**PVkz<|Q(01piCzv%RUm)E!VcmL~TfRE3w z?{9zq%K|`d55VL<69BoN`D_Q^>tewQpk9o008K82y93-LVk^`TEiQMslI;O-zkfba zypSYzlloK%fW4M`3BdjFau^Tf{#1M0P00lfO3{)D}70;r?Ym4kZS3NR@b z0H{Oh@1YJeK&$}>Kwk*}${#=kWfgF}0U+84APqn!fS3W%dO%H#B_O^7?tl{m8m9&{ zPYq}Z^T06yrQcHn{-lX)a6CXF0)`U+FcJfp0U~K691a+;VJbENa9Jdbgz<3b2@Yn+ zFjj)hVju}+YMlL4EbWBtr3{9{;baZuJrxrRmH|u%`+y_pQ}M_KKu!X*J%IZ?ppI^y zQ!%kX01V;*_fzguG5>OHA#vy@>#5lO^@ zRCod0*3ELlAP~TDSu_c1Y68JT`=!O&_kY7KpetiHPU0bl{>B4)VEB&*$jlQ!;wU4y zE#?R~?0#4T8HqE$KhH%zBVm+<@|G)F%-3c4vH=FS9|NkYsuu}A_XP<2kuXZ7wAQ9* zaAB>*#k@pYU~qr?eL!2cRSM^x0O6}i7$u(HY3&27-C6rEfZ6W@YCJOGXFfpWNRu#P zK)3H=!0vU20qeK2+^_-MehjGF_PtHu+!NpvbVoFf@b@2pEdma=9|Q0&Xg?A-E*=H! zFRlSbpCklig98r7!cz?`WMO~Iay2^O>tbvGG|_D#4Qi$f zkP(oH1L*#NtHaS4HDQ2K&N)*gCpHKs3~=t`90iaG15V$kNdw4}{{R^u;0aB_D3x(| z{_udr=!=MZPU-#`79eJ+cooCotC)RGn+S#l+zA2x{jU;doQFTh;AJW3C-Qr6`5vef zI6r!hfzW@Lol`JU_#R00e-8i)&;Ln{4hZjm0_RZybpEpe{730@0la@3kmL39+kRc( zHW0*60BtP&xk;J36lT8vfohKw_5{7*Ukv`Y?3@x%5J2H{fCmBaFFHNo<@N3ToqwGS z@bUTe{ms8D0Oa-nO#U+gko%d>b^y697OVi_i&1|NK$DB%?f^H5+KOO^7MI&!$@T!a z-#<ZGq&^Kq2+DHr3XuMIIRfwkAVV<_WWZ#(_XkM70w^&+1jx$aHBheL@N0qe zSC`6538&-*s8lLxO;5dI0Py`!b7?eNd{-33ZHZ$*y_PFLR{ztVvKLMOb#%IVP_LT- ze7S!LKpkB@J=9?ah(iDZ&<_OCpF4n<&{ZS#27qWIfICtfRP%&3=nA};cy^;4O6iJK*}OzB#ehc zCODaj$AKWT7)X3sFwS}^)_218QU<*AlQm6{_f$+GSOy5e?*oq3OvNJ`067iNW`OiF zppI^yQ!$A^0Sw}S^i%FrF^Qn9B=-GeKNVYlJU=l1XI%@+>m>n900000NkvXXu0mjf D2=;<@ 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);