From e10189928e20f69a3a388b872a25205c4e630415 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 4 May 2023 13:33:00 -0400 Subject: [PATCH] v2.1.0: adjusted toolbar dimming behaviour to be less obtrusive --- core/src/main/assets/interfaces/toolbar.png | Bin 1804 -> 1792 bytes .../shatteredpixeldungeon/ui/Toolbar.java | 31 +++++++++++++++--- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/core/src/main/assets/interfaces/toolbar.png b/core/src/main/assets/interfaces/toolbar.png index 683e37733bab1228accf604bfffae89d65c789c7..0f5d79e9240b8d27f9a32b4afe261b6f0250f7db 100644 GIT binary patch delta 1771 zcmV>4uB4jDSrR}0HdargNS-cKP#f8l#Y^vdVg|)hk0jfU{qL7a(8PzI4Yr} zlX-q|R8~$@S5IbYUvYM7jgf+ReQ|7DFDD=nSX)w9TvE`|vaGCqprevhR!w+(a8p-K zpQ4ddR!(?*aHg4VWLiL1T2bQW+gDprQ&vrPd~Z`#O`f5UQh!!WkbqrQT2UDs6aWAJ zmYR`MRZMn!ZgzWbouH3WRZUSqB34;YmYI-JR7`eyZc|iDQdLZxpN~;hOi@)$QdCQI zd2MxiZJVBsQB+JlE*O1mPgPh?OixCeo{e;QZBbK8QB+HsosCdbOi)xyvbC(Oo^DZ7 zN^^K@nVgJJQ-4br7!yS|BWzVWP*O^BcWY2nN|>9APg6^JesObnYl4P%TV7Ric50WJ ziceBXa(8NSc56>jNl;NqmYIr9Qc7QAS!r%#mzjxib!nEFiItd$PEkp4b!ksfNN{v% zPEbgdmxxVKNtBm}Z*ypqmWEAGNN;p#la_~0Pe*QZXMaskN0XI?Oi)N~b7yUGW|5SI zOixE{a%N0UMs0Csk&}c=Pe*KUWsj1BOHM{?ab-(QMURn!eSvdIPDX2QWPN~hj*)^& zO+{;PWJ^p%YHnj=XkAH7MU9VvYHwpoOhkKrabss)SzS{~OGJBqa$;s&NlQa*cj-s~ z0004WQh!cU06^y0W&i*Lyh%hsRCocbl?8*_Fbqb0%*@Qp%*@P;rQ@v4;oqOEv(={7 zDC>*kXm3iqPa`4XSQyW{IF5M6acx2f-aAQ1zzrWUCow6RAtjakpIn+rI%C;3c|Pln z0pOjHA!1Kv7E3ncd6$zL?eg+-Oq-{SqfH0_oqq*c1wbAZ=))9hii&6g#U;hXf+#I3 zD-&)hhaqO(-EqpgLdmwaFU?_GO~L0daxorZ!A4E6#2 z{r!DZ3=E10hB_29fMGp=VQlCg?j8Z@b^rr#sJbH8DEYB5^|O8BjGKS}SkR6Mqzy}K z9qcEAsGyTmV+txJr++s9%nt*g36u_Z!+#E&J0{`8KDltCH6uMTI|my!j52OU1|TQ_ zSos}nQu~zIHU;O;FU(5jW@o9GUjR=ms{BiO0L$M4Sb-TV;{fEoyzF)Wt9Yov%qnQS z*4FR|tTS!{0?2BXzyzz1Mp{^uPt{7oyQ?zj=GK~GTNj&K(F53t96%ZlU`6g}*nd%$ z29)j!cWkb)?2+H!|GlFC1SHtpHl%4bx8eMQ!+ix62ZxRU07r7u1E^{wsssZ63ziaHa!0Y#W z0)9_4cV6xC^6-)F_uQKf`h0;ah$$Wbgw4Q2z9E4^}=8{x}_gCix`{ z`tbOahdfj9^630GVCnn90U+%-g7$VO|9=7xc`SG2EsNX_#yvdd8N56))_*h@G#Iii z%d#!o4#6$4f+5EMmJ~DqU}9=&LKqyEx)?yv#?vhTHd?PiOY!!m3j3XN5J0^GU!erS zkfmb5jZe&H={p?slm)_)SSgAcSSc1>*w|}5D_q^-p|6~pVIKo{v`2RzS8EFvB$FT6rqQ*MSIBhXd zF;*3%(#|=J@?LA>^hVQY;cTvj0Kg~)#%kOvGuaO>VPGKI_053N^bPe)*Q(?(-5p&|vjA%Ff*)l>UV>wNG)*~qAE!6r;H&(^W$~8(uVBypU$7jHx}^^mWv9Qipwjq1JYzp4r2T z<%k!uRLUH>>)vkoZ)CuNb+wlTL%p33!;2q?7xG;Q&sT_#Xy|e50&N%o5Rkeo7@DMn zc%dwhnIc<+JmxJ)8B!VX0m>>S>ZYyMtt3r+yRPR*r%ikwqFrU5)?% N002ovPDHLkV1fb4C=37q delta 1763 zcmV<91|0c-4vY?vDIQW%QlqAogNS;frIe16gL;2*f`@r$YhYAZPjYu_kxdwXprevh zR!vh^PM@NYQ&vuRd~kSua8p)IQ&ml#p^#EmO?P~6N*7=mYI-HQ%abdi%(NadVX{nmYIr9Qc7QAS!r&6W0#qUvbC(1 znTf5QZk3pbPEkp4b!l;RX%`q1Pf$osP)J2LBWzVWm6wQ3QAu!gX_S|Ula_`}P)Kid zXm4|9la_~0Pe)BpN0XI?Oi)N}b7yaJXOWbJOixE{a%OFEW=u{-k&}c=Pe*NWW{;AC zOHM{?aAj<9WlK#(kCB3ZeSvdIPDXuzbB>XMN=-#;Z)9t5WJ^p%V`yDTO+}55fogAK zYHnjnOhkKrabss)SzS{~OGJBqa$;s&NlQbY#=k270004WQchCzl`23fPKtI*EtUfm^Q6zYlc-aa znxBolkOi`XKoCSZMBK9wcfo($J@-G&@0l!95-I0l%|oVoF+Z6~r_-4*B(eAUyF&GX86tLIez-T;w9^;ms>PrDa8o=_`K1@QviAG*G8eRZ0H}>~v0q)`s_rn7ZMkK&f3J}uZgMByu zyimsh12GJGdz_o%K56c@r1brF2qr!GAFe`N0UGrorkpTKeO`Q6G60`}?*PVctbNKE z{zm{zAm_9m+G#WAl(7-e1#~!p;Q*TtU`di@Cy}9l@OjW^>wjo{$pD&&+Wz7HzyL&5 zkIkGr-2*rygOjOT8afkhdOFRjB2J*|W;&)*HE<>>4IV^r2PMuaZ(UhC0HW~?8ol0l zscx-^VIbIEMb1zY%5zJ}Z;&(CtBcM#|28{|En@A_(`p&*JIxGmk58+DXWhI!4jI4$ z-b4U@uQ~uQH{eGSz#Zxc+#7C;5o7$0R^}d8|KR2EANDUJMoo*9QlyA1-heW#ApqiL2GvhpnF3Z&VP0i<~S>f-uyApnt)q+E;QNFq2og03P-aiBxt1TZIm z2Jjgm0dc^r02kdn{9#NF7Gkul>ZWcOb;Y|zTUJ8`P~!2c>kbH@0b20D$=TUS&C*z0 zTh)h zeTc2d(!mG%LSB9qzb@JyRW*SYbo4=2>;nw#TwO%gO@~g8zECHc+Pd3K1_&(B75e}~ z`*#D84uc_mp}|Ou`8Jj(lff7{nG8nC&?=z-R(EJt&K*%-Qj4{-ENd+S(atL))UlSVkXYP68r!F002ovPDHLk FV1oF`9gzS4 diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java index bb2c890f8..2af3340e9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java @@ -228,6 +228,7 @@ public class Toolbar extends Component { return true; } }); + btnWait.icon( 176, 0, 16, 16 ); //hidden button for rest keybind add(new Button(){ @@ -314,6 +315,7 @@ public class Toolbar extends Component { return true; } }); + btnSearch.icon( 192, 0, 16, 16 ); add(btnInventory = new Tool(0, 0, 24, 26) { private CurrencyIndicator ind; @@ -376,7 +378,16 @@ public class Toolbar extends Component { arrow.y = bottom()-arrow.height-1; arrow.angle = bottom() == camera().height ? 0 : 180; } + + @Override + public void enable(boolean value) { + if (value != active){ + arrow.alpha( value ? 1f : 0.4f ); + } + super.enable(value); + } }); + btnInventory.icon( 160, 0, 16, 16 ); //hidden button for inventory selector keybind add(new Button(){ @@ -681,6 +692,7 @@ public class Toolbar extends Component { private static final int BGCOLOR = 0x7B8073; private Image base; + private Image icon; public Tool( int x, int y, int width, int height ) { super(); @@ -695,6 +707,13 @@ public class Toolbar extends Component { this.width = width; this.height = height; } + + public void icon( int x, int y, int width, int height){ + if (icon == null) icon = new Image( Assets.Interfaces.TOOLBAR ); + add(icon); + + icon.frame( x, y, width, height); + } @Override protected void createChildren() { @@ -710,10 +729,16 @@ public class Toolbar extends Component { base.x = x; base.y = y; + + if (icon != null){ + icon.x = x + (width()- icon.width())/2f; + icon.y = y + (height()- icon.height())/2f; + } } public void alpha( float value ){ base.alpha(value); + if (icon != null) icon.alpha(value); } @Override @@ -732,11 +757,7 @@ public class Toolbar extends Component { public void enable( boolean value ) { if (value != active) { - if (value) { - base.resetColor(); - } else { - base.tint( BGCOLOR, 0.7f ); - } + if (icon != null) icon.alpha( value ? 1f : 0.4f); active = value; } }