From a3c9800bd82dadc9bc43a4205c165360c6959bda Mon Sep 17 00:00:00 2001 From: iProgramInCpp Date: Wed, 20 Dec 2023 12:59:51 +0200 Subject: [PATCH] * OptionList: Fix embarrassing flipped switch bug. --- game/assets/gui/gui_custom.png | Bin 2375 -> 2368 bytes source/client/gui/components/OptionList.cpp | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/game/assets/gui/gui_custom.png b/game/assets/gui/gui_custom.png index 1315f75ba244daf262273c13937815d62a1bfa31..7167a6afbad4b71af28449855a77b4c515914828 100644 GIT binary patch delta 2158 zcmV-!2$A>462KCWFnXfB zha6bY7wL<3_HOrfXXoGE&hCCbaIib~%rhh2^PSmeXXdxyPk#pweigdt-ft`k%kIBF zS0A6Aod{R2UJZ*DEy~r;lR;zXI^9BV_4v7LFgqhR(LvOy>ksYa2Du1=tqd$D2_Imt-6HS-hxpSv( zotb`S{z>=Ux2*R1^UtrfToyvMquF!6+MRlxMsK|Ga_&ALtHc3NHq8cqH$1Xtb>?+H zK6gI6cldDF+AtqdlqVj4Ja-=_PM$1aPbjO>1VF0+-TWxudhk~&cPCz6zwAHpI~b!= z1Goq;?tj^vdEI?`_k^?OFNC$LR~EQOlu2mBPqHnOfW5CY0Z`l-Kr#Jv(jVV_H~jpWXXbUAKX`0?;g$tW!QM2W(+J?{@XMX@t7NrS*GDo=e5%-gov zI<42wK5j%FZoUDTPs$C>6*#gH55WIw*qHX*1@0D$LG%1 zz2Efgww7&=zVlY>?>p&}iHR_Nx;xK(puC2<^)QggbK9N?znL|`mqqkMpykV#=jtcz zEw+tE{l+k8wCUMxsm~Ph+P8O4-TQ|}Mt@qi{bXVy_V@Ikp%6ltnwsj$#uqPM96~7H z6M@p$wPQyJA^yle+kBn@G#>RE!=TZ_BO}ff225=ZVB^M(;eiJpXuHCdD_07cFK7&% zvON(fg!l`N^4NdiKzM%VSgt;jelCA%bVCRsgojqGO4R=0krAKy2S_adZrr#Lu76y) z(sqSvwVL~kAv*F?PRGVi)q;cmR>+lr?FMw(z&PFJ3}b!5Ny}^1f5-lQ+3>xI_X+w@ zVV43A4-e0|V5nNHCcd^HI_(@kbt=5}+N-f`$HsPs(GAUyP|>ZcSO0Y_JUJTwK#b$# zC&T^U{NEFT+}g?@Dl`C^Ez5dw(SM;sf1a~!%a)&{?&qJMU7oY-d*4p>Z9$f6=#$FZ zcc(w6n+F&Sh2IPm4fwQ|4>$h7wHxfM@A|7BSnUS;OnW!BFnCIPH(;|ffDqE31vEPY z2qF1dKvKv5ayb0%We@nIx0EITiaP_SU*7%#B&Rc=;rB78^hSx&e}HtV`Fn4w)ym? zjV=3$j_7MvtqjMIQ$S!QM<%h_j4-|9|?yZtntpq|gA!^E`psv-i|4Ewpsv8Pfv&G>FGo(4Z^kj%7eG3Jb3S`1;E9N z7rV9-Wql}!^5F3d{@ynfLU)hoWgYyD@>Bv=0hqEHdi%(c1>M|%w||cu>E`C=SiE@g zSFL`RrV{YS=g!yKM^6gsWDw-31grw^;Bp~QN@*(rZ{55(yz$D*;l0C$J01jSDgp1? zyQkJZdQy-e7(4=Cp3Dw{=zS-oE#{;r&N>a1v8Cy#ELQ z7+^jE#3*78poncYZ`b^hVx4@9+1&m;MXA>bfE3zQ{()X201|p+&FZ>~d&;O?~6@jC&;YG+20;B8K zwJjS?e{vl_Mo|bP8Qe(}SvEWhfw)0ETf25i`=R#;fEWuG-WB`v{LZmj2()UG#{L5b z60cvWRAPUg8h_nT3xT+HX+olLU3#AY$SDeeAN};%Ztuz*Q3yP=YE>cq9UDJYNI#T^ z04Ts9g#i6U02D+B(2E2>j7sJ1R6j55-dziUXj$HEwr&?c2hjMl@u??kA&}>Dyg7jW zA^-{&g}{?P?#vT^@`ysn4}OSrwJ1m##T5pjwW+Bo ke@l~b2)-Hs0Kh!^FFhv+*y1-GO#lD@07*qoM6N<$f`JS_cmMzZ delta 2167 zcmV--2#EK<62}sdFn4S|i5($? z5PrR5qHxfaNq=bew~^>Y)ESG|ymf2pb+>HV)b#%FU;mbCpBFBC+Vp;UdOBA-QRj~o z38gYc0XJWfpexh-(4;?&%zraFI$Ef)*=yIr*KWC`<9c6w{&}JOES9{XRHoK|i{uTu zGU@#N@1|ZK0MI)lomUB=UavR3FM6dAr&g;qUXTCq(SOG4$@h=OF1vB#M$H%t&-`j<=51QN{?dzu+km`M1waUMpYQj-@kZAUCX2Yv-wO|{ zS)F^^k4~Qn?;bc1o@^NpDa)geJW{xgqsNYwa3oY!>Hz4rb{#tYEZ@HK*J?MXUf#Uy zKgkD}pnqE(xD3zl+MRpbJ-c^>Q)kYGwX5$f@rbCB$^<|arM=3i)oS5qzuca>-M9Ym zO0NAhZ*Uj_mDUu6QIyeoim+Ucf0zVlA_`BP6V>OOz)(E8Nte(>Rm zE*=S0;#&X~`1`5Ty*>mMNoB48mM)FYqPXSl)_)D5Kdu0vDpChPRYw08QEId(p`1s7^Qvm+ zPwS)8XPVw`e0odUbq~G$X5#O=>Eo%XFnOXk^FB~rBfXjoB=XFbr^0XM4e;d=%?Nb& z-FFviC+j1&t!Mq#Fle>$=`ESB6pGrjdw*Bc`}@bn+OGTY)Kuc{89XB)gfKHR)03Sq zU%otqP`w#}ve>b0TL>Zf%s<~^UIDb8^;^TB)%{~*t`vq$V+>%!h7IAayYA|^!NrRg zOBpX{4V|jZ2oyr{4M#=1ymxPScKbx3Hqw4Be|-Gm5JCv|ty-08{rktpeC8h_jeh{R zdi83!c=2M#4eIrJ;VXvd%uh8Po;=)_=j8F@;ni1PNnCegVtW{WIQ|S3J-T}7UzfvU zKeW(e|VE5oSN0Dp*EmiOkO{rmsCVA;&VA=P+o$lL$ zJonJ2RkZDHe@-_JFdRz16*%hfS)U(h{e$b&+1o$$*W9r>b@sXSJ=ntVspPW&A;ez+ zgpmCzAnpnvg!ESdX&w2?f$+N*P4G#7sZ0QrcLmVAyz>=6d6&A+?JPb^aDTU)JAXdB zclb!J4}*%SOaN3(S+^*6L*Cn-SFij|>UDc@TQ!TX^Z>{^cR+O0%@Z3pgo%mmjc)=b zCKgV%`NYNzZQF^?=xbKp8;(pKYkU)MWOCv3)@xS9&vrYAogdoW3MxczcRsw!<)28tHOD~3Z4;<)v z5M-$Yyl3~W#`@7rL4siT2!KU0KM11t-H^4E_uAF>hNH)hg;QtF3W6ad01}i@Pq20D zAZaY2wQP8jb|t&Blz$DMzy5=3*Mtu~Jkcl&nx>?52PUg6109E-+!@fTO$Mxz5QmYHj0!D z&$8b5`gM&E_;_k6_5QLlUHD)T02$>8fgRhnbu1fRhCCsl80c^l06An0fld{Hqq5;; z$P)tN>(_NG8_r;IA3#n~2&C!UX_Q$uJPLuNPCZ|z_0qOO{}BKQmM*<1@#op?6O9mP zw@wx>@7m`o?wEk>({INy| z6!{!)3}CPbfRaTa@Ys*LGviMYQ3!nZo_l(IC{%>|08hFg3V}$K%7#ZFuxIzKaPIv1 zULOuUCIGr*eyQ-Pl?{(VAfjye@Dc!R40?s&s8slsD_4{aA7aJ;Vhnoche%J0f>cpb tVG!DznVIpo1e0+Hx08Sf2^cK0{{m_o2-XdcUI_pI002ovPDHLkV1jl-SNi|} diff --git a/source/client/gui/components/OptionList.cpp b/source/client/gui/components/OptionList.cpp index 641d8d6..0714175 100644 --- a/source/client/gui/components/OptionList.cpp +++ b/source/client/gui/components/OptionList.cpp @@ -195,9 +195,11 @@ bool OptionList::isSelectedItem(int index) void OptionList::drawOnOffSwitch(int x, int y, bool state, bool disabled) { + // Obs: The color setting that affected disabled items' texts will also affect this. + m_pMinecraft->m_pTextures->loadAndBindTexture("gui/gui_custom.png"); - blit(x, y, 0, state ? 18 : 0, C_ON_OFF_SWITCH_WIDTH, C_ON_OFF_SWITCH_HEIGHT, C_ON_OFF_SWITCH_WIDTH, C_ON_OFF_SWITCH_HEIGHT); + blit(x, y, 0, state ? 0 : 18, C_ON_OFF_SWITCH_WIDTH, C_ON_OFF_SWITCH_HEIGHT, C_ON_OFF_SWITCH_WIDTH, C_ON_OFF_SWITCH_HEIGHT); m_pMinecraft->m_pTextures->loadAndBindTexture("gui/gui.png");// bind the old texture back }