From 75746147767b9c0540bb44c2320bad80375e4216 Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Thu, 23 Jul 2020 17:49:42 -0700 Subject: [PATCH] UI loading cleanup --- .../Plugins/ConformalDecals.dll | Bin 73216 -> 72704 bytes Source/ConformalDecals/UI/UILoader.cs | 37 ++---------------- 2 files changed, 4 insertions(+), 33 deletions(-) diff --git a/GameData/ConformalDecals/Plugins/ConformalDecals.dll b/GameData/ConformalDecals/Plugins/ConformalDecals.dll index 02cc3336ed0fd7fb5e6e0ecbab56f370c869b9fa..e7466e54fadafb523be940f9fb2959779e8e19f0 100644 GIT binary patch delta 17915 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 delta 18476 zcmcJ12Y6KF*6vz+@9D|3Oe%q7QYXm-GAZ;HS_EmK_ayWv7(xIE1Sb&)h*;uQu%Hk@ z5W#}Mf}jvl6bph4X-b6S5k&++4{%iO`qth+Jm>uPx&OWQpNDy8y=$#+ee0{chU(Xq z>Rrl%%M;#PXnh;>&q+v#w_z4Q1OgZ}IZ#h;8?X?!C)MzE-&z-L4Bp5 z633}+Zdr|nhWBpigY;wXH%h`Hbz1+;cu92)=#Pih2?L_BR-HefW7kd8_p$WNp>IF> z-bLS?^!&Hu@$b{^Orzf>0uOry*<4NMC=Osa(`*J zS$|%;mad*2I2h-ud4qZY zwkaW!ncFLs4WKf!57=Q=*#qPqYVr7}f35xy3-_nXq{ZS2TT_MEs%3B|%u#y}e$LcH zxk$c~>TiRKvW1*JL0Y&}%sfn&hD7aV6K`sv@Z@fQlJ80CB*}MKy?a#+?U zFO||}NM?xS6RfPa`s>(sY3)QaUly523%Aox*&&fIO{I)Q4WjX)zn`K0Zl?|(Hx)am zyT%n`d$r~Gdr96r{#JiSF$KA#T=o?e_1k7I34>V`ACtVmM^>7eD{0EMkjo;}_zCgY zNzI>7pmv{-)0NuLiR|gng6bGab#%TN%ME2mMYP_Mua!tPnI@1e!)_`|A|b?RE{j&L zOeh#YJDrQdP{9nV;x|dgMcXK8V|oH9X)mSN+G6q0ukK6x?q7YwvJ@yKdl&V-qP%cF z)s`X|eci|{Sx-DlJzSKDT~$NzG3=%`73X4KHKL>~c2@_KBw|msoa9^8XG_|L$#crQ|zvL79=3REu%VqnhU6L>UuZkN!bd36|&rJm_5nr6TU}8+m9-^9? z9b?U~8@Xd_lF8RW-8L~tp#gNM>!yUOe@twJk!tLusn}m#Jn7NAo+2TsYByEmtEWuT zdq}<>q`O`6<%^%OT9?W2Fm;Le@Jt&#xt7Wwo_rFc)z_zVix5$Kw~A2YA*RS^`t8{e zIyD|?3bvk>kE7LD(=u?Px@KBu?4=%=)*dIR?&(XZ&mNs#g}v4A(l#wcA1wMiWgF^yzy5U3N_Xh!-q)RLq-j@!Q5K<@hko?Mo$b zP)^5^h4gih{0sfk>Hr!|AQAegb+=^%yOX5QmsU8fME-^S?jy-Y=pQEVW5#%QT5=e~ zq>vZf;{GGn2vK1IuduwGf?H`N*w(0=GvB%;QdW zqVSx-)oeDI>~6@j43OP$*g8PA!vPGW+2KdVj*^havz$ffhQ+o4vJnPhP;~Mx3SLDvwsfXMU=@J#J4u}-*qz<=3AMVojnIZ`( zQ$!f+-I(fz<&4t_?cj0?>l~-Bs>;UH2#E8Vg48WrQbYx#4WfdsGzY0aXuiIP{b>A* zP{fn*Sfbsx5O&&x#vk_*<^GCwPfQGqvxy|O(e$*#dugJpUnI1`b8#Eu>`=|){WkS$ z5ziPS9Ot>U*=qL{fukir&`wiNgm@%EbnNDqV!Am~IE3{ah4_$0Is&{ju2xtRFNSFX zwbBY##KsK|a?+18_74@BL1_Y;Xd$(c?rtOG4`}vSi3*(8N<`@B5D{9@N^S_k+mS*Q z#S`bCc?vCz9y~$*Oce!QqW&o2Kz0~R)9MsFL;glMOLKzS7cK(5z!hBPp3999rS_6+ zgm&?wN&S6d8QXG%oNN==p7F;NF}H#fX^L54zE2c*o2DL3F*dKIIbnpSQg)G3mRHDL zpTMqhLNk-`iakW3PQPu9w*rft7!ST;qll3@-gW~TPt(u{KhlDy z{xfZeGr~WE9O9pFF0KGC@xm+civD=VWwK}BowP36;0zk4v3Lui6%JAbZaA8>F|`#O z%Q4xXz<*Ge8o@< zwhW4&xXeA&ZM45i0#WRa=!7p_;i&^|uywQ#3MN4f*&-tfQVWU6^mW2N5(-l912eeT zb}32NED+ANmEi@cJ_v&dX59jU(R^ZdPewtIT)mLSbaGTd>NAi6eh$+ud#;v+=Qz5y5arG@D~1QThTYzA@_jHF>Y05( zEO;NCE4;vTbBr*~q+L(6>3eo9haJq8#|v8(e8{XeT(D|5%IqrJYTy{NBg|^y6f-A9 z$;A8NEVHq`$FiOg2VxX8q-TW$3WM+nC`{|(LjtYfQ7|$ak`NNO4;}|IidLitLIO3g z0YcceF87v{<*-F(Z!_Bp4z@)ydmh|aLsdLL>;%35;cUxnDcDQUf>{st489JXc);JJ zu`h(ZFc582VUYIy8hD48Oza+-6@{>mm_*%OM>87nJs8aFTV@Az){^X@c!-!NN2fIu zb+q>x7lGy%Z7~#T7QufhiQf zpcNs4_9xF6x_&HTTRg27BwI1tR&dNFVmG5SK?$e!3?*7fgA|<1bR@U_J391+k>LSi zHShz>Mi&f-elpYrXS3=Fzsh=+Fg&r3dZ68GyR2j!ppeJd75PaT=BzNVc z52c87?=?zCbGa!0VOUUOHsoeCZ2MEW-EHD@d2Rr$cjS|9*`UI!x8mxnJ`7>#{LV=_8G( z-X)(29Z_At*p2bHBsA+-ewNUvdoIlg?xGItVcbO_9*Aiq6!W$%Y?0ojv%ac!B(@pKG<+Nh!=ag-YM7go${l{qtdZV19Oof#8161ziZ z{rx{u?72D{llC*Q8l7EjbJu}Svn}fnGCrsoq0%HfBzW=$8z;%IRcBE-7KZ|- zb(WhI<}g8&7wA(5wuoql8CKFkO0X`Jngx7xfd;S&{Khzk1&%YTi<*)|EC_~V&3JoO zA{jl*YGFkdUCYC1y5PLtdMlh|rWLfp<-f2sbhb>M=F*shR8FGPS)c=UveD*a_5GhIzmGVpTxKt~iz&eT|U?>I*+e9o-Kd|rKWLCc`e z5eLENe(gu?YGJ?zMUT{=6&EMDBGAlpEz zu=VPou_>v7eWkNke1dJDTXMqlz7)Y$b`h)=x_ehTGT^etxU2jyhi-w2T}bT)=qYj{*=?Y%q}qazQ#(pgpL3yya18?##T zh~(CCd-zjlQal$ycLl8VVy+6Tg=l}^i!?ba7M`)w7&@`{1BXrT( zl@{aVPSEeVXRO!I2}bGcRA8Lk8K&s$$AH(+87g%4u4kOw1*&y+z~eP^0rl0YalxtC zo#cGDBOmBfW3I~H<;aKm%*1}P*U;>=W>^a}Zj@}U4Q?oti%a!}U zbY^wnPyNhM04aTiZ57PNQ;u6sD7I3P~}%gA^2|9SZVsN zj?n=9HP%IOI7?vV0F8O$9nMlXIZ&`VxHUb^Sq^gsUuRvM^B`m>Gal(G@D3Af6)cPx z?yQ1dI!nt4PHTFOmi-V**fczG0V9Omh0@Nv`Xg+SgW%^8FxGHhgWoV(0{M9 z4nES^oQ#K^kHEJ&tHmdskHQt59ZrANxdt4=wPf^whz>ZgYYh#*KEWRm3QG$8VxZM=BB2)_Q54)-{IWU zO!IpXHAdL>ku6g#2}TE3$2=wPhh40#HLr_VFMj~GvBGDSxiKf(^$~>Y>|@);k3>km@M~meE~0x7Zs{>$vnpO zCAcRDrZx017%keSxd6R@3`*3j|QT0_5qQN>(>8+sBp zF%u1)Ny1oZ<3D8Hd#jZ0zlV316 zBQ19Q0KIhfNl;$s`Vp2etu2lGTxVJ$eEFSyRbEjrue*lxWDi*z>JNhd0o;B}o&Qfq2j1Ye{> z)UQBy7({X2cYg&BGf~kiu3uq_X5)%3!)%@1X4>z%3~O|Tu1{Q7V9Au5QLe&jjhVl1 zbHsHO*6Qp+oBhOgF{^=})fRU7LB*(3hFW=Wnh*V7YD+ zCmh#c@-!~T*vksmL z@?4`at}q2X<=hH*gJz2lhwCiPSpjKS!HjNbMI)r+Lps|OFW7dS9nQueQF*rB8Pwi% zjL?|bnx5}Y$5uLvPA?!fTxX&$GH|@kL|s9i5f6#tqDB;7YP!bYVlEci?I2($;8aRs&VkrLD2M z&JKr9bhk#s9N}35a>NXG7A7&<2llv&)&TC*82%o9(V88^&vp7O(HuO%OdE<^G|m-a znk>NYV=3$l2PSL4l9v;vbFNZulaf4ORt0{EuK%ZK0hb(fp z$KV}I_dyrq5_bn&q#3zjCtS*GmAT0Lpt}=3&5WiH?INAWnSs-}LN)ZG%iT*DhG7GvV45E1S7?!@O17i|Ujxz1WKTe^_T@k%eiH98a5F$L(W(rmWe zt?mMxbAvUwZ^1ppsQy|wk=x+zi{?d|>sQ43VSk-f=O&wO#XUM}llz9dKc3WCQSRIB zfp}JDW5_lLL+;X|%+B5KF2p4|n?Sd5hhQ=Hb}e1;Y_|@@j|2-+^L885&o#zFI2Qk| zG4td0uiRttXJ)}#^G5p#qL+1JH@dhUhj2FsH4lt&5^JHe%*aK?@#xc8vR|+~owZ}z zNS$S|tx{+2r+#T2kB{o?FthC%3!26Fj>q?zYU^M;PG2ml-v?rrPQchD8WYp92+Nt( z!eZ*gVqBoJU#SmEaODkl$~_S;F{^`@?LWCEW8G4268FVad_!kJanofgzRh$oya$)u zQ&Bj|d~P!mr|E1TD%QQG(i`lW<*NJk8|+t$Ijju7XjVlzp7;y<+h5pE*O@r}mE*5W zwc}qoV(raL%hAGYF}w=yu=2m8Hv2~Pigmwh&JA|W5*0T02K&{L6gD4S&0>PnrG5?C1by`5^`y0fIm~Z`?+%rMwe~h3v1reUf7Ubb1G3gdl#R|kli^A`y zcwb~YEu4mCv+%q>QdpbIbF+m0EZrGGD6tE9t~%(x{NUtPLZi}SeF=tgGZvHQ_10^B z@ZZIqoNWO$j2;rS5jfm?6W@?UUGu2HbSqJH+@Ba+?{hlofoh`gIm+F!*e9&HgbF-D z`553al8w-b&;(t>fgZD(Iotm`e-T-R!!*JaKlpDIDF0T$Ukdym`-{{SPTIgpUvHik z?YfmFn1ORKf~XilOeYD(ggTuv+!^h3DzJd(q8JB>tuk5vzj+4#CxZSrVg~;Q+Vo#k zFGl?#hv-q!ue3plehuN-cWDBf zPj+n~X48V8=OMf-v}kgw7)lc%onSX7$9dK4xv?D}J&+Ji8j8(=t^nc$Hcw(t;Qt|s zAZPKvPeR+DZthZl-5|6*>@aUS+9YkD?Mc>mwcXs93dYIQLlShMbs@u#>^~rjH&|h~ z9`tRR{|GNi0!1+i{$y8e!yG_`={X_q78+_@+I$!McljV!zb;)wOXIcEjcTDi&qXI# z2+a-uE?=bWQHECt75E#W0iGtjUg`_Be$Y%KQw1`#B9 ztz)%zXxRL)pmkkyYjgR{2oY`rO+X1$o-0DuG=D{{S6We`5435AIigRq|`)Lxq~ zN>=}ritmEMpqN^;VxzXJ0a`!W_Xj%F-jEF}zwa+WI@YY1cLWfoDkju7b$p`xS& zy7Ck9XvRZ~0f}zDIH9j33{8Z^aD{Lxp!_6VZhPgTqzdRuI3G$0r@}pQ1)Y+W%i>h5 z7kt|KA(Hpd`CPgDDV=gXMm}`D!}?)Rn6wp+$c1#e^%y5H4o;@L183w9=#q3YJ!&`# zGvE$S@Mn65=?>4&a6#UX_6J;{5KelPCM~5Uy@K_^2GV`q{@^{8Bk z?txVldL&wuKeEQ-8M!g197UXk=u*Z+)DXT$IF3ry;u-Q>gPRFA5UThB;lvzT8XDgvOH9gy!ZmWH{iufic>1bjS=Be z8j3zE$LTHNr4H1+>4c}Uvk1@UW=UyE-^_5S2Hnve2o2HQrGOGguYd%%VGC zK2uskiH^jT)Z)eD(<|+MsZ?1V^RQH|JWVlI!dsrjQl(Oq^aSCz)POTV`B&!_%3Wkv zM~0DDf_+SHNToO;Znsn-i-+&!Setf0dYA`d4G+W`9)b(P(p_>%mX@>|5~a$o$3?riOlXP6Jk zXQ*#Z$mMuG29?d!H?$zJF~_VNf^tuyvQ6ol?o;;T;XpvyhEFBuDTT_WHXW7i+!MQK z2#QGaopFZp4r@MQO*!6~>7>CrY^hT|Cw*`v9_P`b>pH5q9LGdGuk2UW`d?<;p`V!{kNXv|^^0ldxXHJs+L zKg(l(mdE}ykM3!(#*3tX^4)5<#6G{XPa5XtEQ4*hi0%em!D|t-D1unJzjN8X*g07> zD7ZT28AGrMpQ8P%Nx7p{mehnVCv7nt!h!S(${}3F=*rBJLMWAyctz=B+)0UgV}G5qE9CC<%ylz5vV|O(E#v^b3Aq_NhI^@RZi)TFASR$< ztj8g-6*Mv3mVi=^b0jfU#fsm-D}D$5LhHUBUyTc;zFZm`XWW73V)LlfLZ0BoE%S_< z>BVe%=2}l(QEY5dJjrHq70=bqz%NNtjc4GK2!SgM0=FttjTY%}U=iU@*^7)d$}qa& zVxd%48#_=1>qwJNH(ff=I$Fn?t%Sub*BLj1GyYX$C5o3`&cIs#r&Q`hzyKEMVldkP z9<2inSF-c%tD$2lHT2SXw4-Y%)!)5_$*9<;4` z(3^7+7V=n{~x4zk8WRy zQAcy7VX56r_(huCTxd`uJZ5oph$VS$YJ#~^JlD)M*TYitBI7*<(Sm$Qj93_viCx2+$Nq8;eZOavd zKQ{O^{Ty#|%CbW`7&vFyFU^X+XgMThnJ-%kr4Log>c`Hi7TQ z3%tW1uqpeTrP1(KVk_%tsgos_@XnSU2@_rU*8S4G{)?6)(km2gzx0|%$m>~-FkK81 zd639xDaTb{y+?Y@FwDA58q)F(dc2TfMx|croAnB{;2+d7uQ5Eb+S;TX0kfeJ*ZP-O zlen#wyw(oUtXgG_CC!u8Lo`bc!e~i6`Zy!6^>3nR(=%s6no&IPxFAKwZns{LFnhZ- zctJXle$cv~_J%L59XL=xu5J0HHDIi>9VfkzJJ5<>XG}A0@GPUCjn-ulkmb0asD0u& zNC(;*u37_fi2}BOaYq}YEg;VmvK(O!Cx5Z6^+oZb&VJ=V&m!Y~<#D>#ent-1dth1+ zy@`vA`9?8q>*&1Dh{r=KNIpkcV(b||+_sI%jwKXF%Wc@h?4<2{FyRh9$=im(ILc)k z9`TphHej)5maUXiDQDb(Po&MWSrkjo-DDN#eH$noU99k)v4N)T>$a^lZ4cPCV;j$D zlEo?A2Hs0HP+vmG242z|@GZ|#*pI^^19YU#_Xm{C@RogUNR5$CT({}R`@Z zNb}CK@_fGxt_6+v566lqL^$HK3HUlN!c)#zw{_Ml_28@n+GbUXss7c+Fd2YGilTZHZq=ci3T(UnV|a^jEzROC|2Ws0wzb7gtN?8&)CS=#E21G0b@R62_r;` zpcu(k#(c&S#u~a7IO73&u8#)!9=>voq%Q8)%eg zk^HMXkFZxTYa#u}hHAnT#y1rqukh3|t|V-k{@@MG4C5-2XPeg$z8ET!3-gHNhQ!ws z-k!RV@Rg{S2v0K_9j}u7Xq<@C(Xoqg2sde9q$t(V-%k8=Vv_3@^2Jn9@i9iN*xt-W z(qL`NGrw-S0${2g8bp#+IR97I2z zQ2a4oXF|Hgj6+H8N+>}$98TCBM-tMXa1-{xv4lNwJRx0K5cb9r!f7~(uoR~d&ctbi zWmrmg-u}cqXbT@mT?jvtx)C0b@(B-0JqbUR(t1;Cza(=z_=?Q!;HcD>@Hm;D^=wUZ`5_SfAwgHdt;ZnB%21$E}Jx^qM{-8fZy-j9%u}{R(`(U(x>)>zuf!miw&c$j<&Y2n-q7= zXm`yN@vr(ZgB6Jy;=#2zboDj`@4}X=vkcfTD%lb*p{x3YYjLvhsctgHBf1u6u71cs z|M^Xq*WNJTYGat2UYc`PKca`@psy8%pv#=CKL1HQ;DEvO)B&pL`#ZfH@;kjea{VJD zn(#nF164F`RS~OKc`(6wXxWkHm!14)j~(Z}>Nx4C%73nY--8v|x;Fc|mZEzTLmu01 zJ`1mTHZA?-LyB^uGYj C*H^&+ diff --git a/Source/ConformalDecals/UI/UILoader.cs b/Source/ConformalDecals/UI/UILoader.cs index c97f5cb..67dfa04 100644 --- a/Source/ConformalDecals/UI/UILoader.cs +++ b/Source/ConformalDecals/UI/UILoader.cs @@ -59,10 +59,8 @@ namespace ConformalDecals.UI { ProcessSelectable(tag.gameObject, skin.toggle); break; case UITag.UIType.BoxSlider: - ProcessBoxSlider(tag.gameObject, skin.horizontalSlider, skin.horizontalSliderThumb); - break; case UITag.UIType.Slider: - ProcessSlider(tag.gameObject, skin.horizontalSlider, skin.horizontalSliderThumb, skin.horizontalSlider, skin.horizontalSliderThumb); + ProcessSlider(tag.gameObject, skin.horizontalSlider, skin.horizontalSliderThumb); break; case UITag.UIType.Box: ProcessSelectable(tag.gameObject, skin.box); @@ -105,6 +103,7 @@ namespace ConformalDecals.UI { var state = selectable.spriteState; state.highlightedSprite = style.highlight.background; + state.selectedSprite = style.highlight.background; state.pressedSprite = style.active.background; state.disabledSprite = style.disabled.background; selectable.spriteState = state; @@ -118,39 +117,11 @@ namespace ConformalDecals.UI { if (toggle != null) ProcessImage(toggle.graphic as Image, style.active); } - private static void ProcessSlider(GameObject gameObject, UIStyle horizontalStyle, UIStyle horizontalThumbStyle, UIStyle verticalStyle, UIStyle verticalThumbStyle) { - var slider = gameObject.GetComponent(); - if (slider == null) { - ProcessImage(gameObject, horizontalThumbStyle); - } - else { - UIStyle sliderStyle; - UIStyle thumbStyle; - if (slider.direction == Slider.Direction.BottomToTop || slider.direction == Slider.Direction.TopToBottom) { - sliderStyle = verticalStyle; - thumbStyle = verticalThumbStyle; - } - else { - sliderStyle = horizontalStyle; - thumbStyle = horizontalThumbStyle; - } - - ProcessSelectable(gameObject, thumbStyle); - - var back = gameObject.transform.Find("Background"); - if (back != null) { - ProcessImage(back.gameObject, sliderStyle); - } - } - } - - private static void ProcessBoxSlider(GameObject gameObject, UIStyle backgroundStyle, UIStyle thumbStyle) { + private static void ProcessSlider(GameObject gameObject, UIStyle backgroundStyle, UIStyle thumbStyle) { ProcessSelectable(gameObject, thumbStyle); var background = gameObject.transform.Find("Background"); - if (background != null) { - ProcessImage(background.gameObject, backgroundStyle); - } + if (background != null) ProcessImage(background.gameObject, backgroundStyle); } private static void ProcessDropdown(GameObject gameObject, UIStyle buttonStyle, UIStyle windowStyle) {