From b36013dc57a13fecf4e80e83ff047f65d2dfe95d Mon Sep 17 00:00:00 2001 From: Tanasart Date: Mon, 15 Jul 2024 16:44:07 +0700 Subject: [PATCH] - Add horizontal view for larger scrollbox. --- datafiles/data/Theme.zip | Bin 5210487 -> 5211616 bytes .../Create_0.gml | 86 ++++++++++++------ .../o_dialog_scrollbox_horizontal/Draw_64.gml | 9 +- objects/o_main/Draw_64.gml | 2 +- objects/o_main/o_main.yy | 38 ++++---- .../node_rm_primitive/node_rm_primitive.gml | 10 +- scripts/node_shape/node_shape.gml | 27 +++--- scripts/node_value/node_value.gml | 12 +-- 8 files changed, 105 insertions(+), 79 deletions(-) diff --git a/datafiles/data/Theme.zip b/datafiles/data/Theme.zip index b0396073cc493fa7d1241d1f1da413e926f04a2d..ca5374db032ebf8077a05877d1e6c9ed37ee70f4 100644 GIT binary patch delta 15359 zcmZ9R30zIj`^RsGh@wl9k0{O&h@uh--BdCxO*o|$=O&YW{6cGhCOduy?TWR7GknKPLynLC*$ znKzj)nLk+|SumMWA*9|QDxUJ$L;c}_!hN(^vp&6peA))7=DsI;g;*2KDb4y<=4`PoEiou$)%Y#l zl$Dj$%=$HT)Aaq#m%n%1zg+B?>s$Nt4(Dixxl--3;Fz}GPpWQCZ(Hdz8FGx$aP#Tg z@vixYo=~*G8kM17aqP>p36vgHoK6!KHc$|&)9b@#aEoEK21w2 z{nshp7;Ouj_6~gX(4TRYx;L}Lwd;DbPFQvEi;Fo%O|G%DH*xD$aW$4UB!s7Kk_a98 zFvUzi^La5{@#iOopTs_W-AC4ph~QsBp7evHXP>waNQP zh0no`R$7bd*e>2r{w)SyD|cFIq+8w%vuN7-X4jqXWw+1TFPwWN%=qb2jdZ)akuIXP zp$$h&yIHhkj_%k|+We68xUdS8}xkR-^J!K4s zKqHlBT3DFgKH+fuoML3G7Wb_qf=L5H8hcikM4T7M82vt2MA;VMnR=_YCZHs~f1hfD zuzVoZzQ%I(@!|t}c8OAEOXz9}zv11}C#Erg*GsdEsDWxG?Kbb)?-e`fy8GpJSjacI zUgdtxDA%jjtlA>nrQ4Dm(4{6H*t)E&Vg0CWcJ}As`_{MVP0EKhjWzE#sy_X49e@3! zhLc%V+uszG8y>7K-MgeS!I9o%ui@J{Eih%|6>zzxSzyDU6{Ch;;ZnD?(X*=zm!a>l zmrczywBZTyiMk9{l9M=!M?zX;iRw9Fsb1;REvhD(vcFN7XJ|Xl;wS7*7bErYL z!)O6DlXpT6<{os*zxPOY5&u>(QCp$hd_MYyL5iA0;~_nUoI0(MFEEsPWSYK9<)eI! z;ieBiSx*gDx*e6iQuH8MRBH0^s`qQm1PUI=8KxAj@ub+CS<_h4H<;0Cw`yILz!v^; zpUpYF9|Q&V?6OyJQ$6~A-%?%XijLrOX(_JTw1kGpjeLP&qoa zEq^k#azI$E!S-EX;ji=ihCR5vPEyBxaD6LpZttKFOlzwsFp7F*(LxYAT<8lR+KHcFo zZ+~4rtfX@LrZmRLxZ-VEviu%u{J0{njlTq3#Sr(s6Kd!!_yfZ-K zRm+3mrthpNoh;|DjVb<9d~&Cq#^)S*EyE+xC@3QR#yBJ@>xyAaG|vg<8(P$=3n>Za zh28W%tMX6^N2>Gz_r&{M78}(t zk4Dp+LmgZV-B-`7ynW(FA}xs?SIw1r>n-^{cPHca2}; zWSOSAm2zD}Y=UR^XprB!i)Tcaa5un;S>aLY()|=UC?C~MUbJnN=Ofz}XZL*AyYbK| z`_@H~rxwann>5nP4=Y}H{3@w#_m-~lVzz5;8%_Rbp(dDhB|bh?o^pLbvk?ev}v zdromn1WE{8*SJ@ zIX)%_a7v{=D5#_}8)O&_!4`VA@^uc1Ej*r!Tn(%O27MC(%3G`H>2v{G7j7SamLK2INPJmAr1ABt zGtjU8K0(XG7R9A z8BX6(WLB}Oq}lWMSn3+7yue5CvwuHr{QdOZayv#kLtHV>@WH-gk#{}@t)S@y4bzWo z=hNWvQ={&DoHHScNpI`0Svp={?NF&x@4rp+y^wagyX|Y~O1aIQyH>MkiQ#L#0xU95 z#ZpE#FGwjnJCy%fW3TM(VT-6kzxVWnCdsXxZ4$2KG;~spmc_HN;Ng@#cRIbhFSbDU z`u!fO%qR*xe{BbP=M9!{D}HpO9r(UCv$jTGPb-MQ_2pWjizCO2jKC9~KRlB!8<>u` zw++X-Y@s&EYW~nS|7{qb$D%aRk|Tt#h6!Jl5e+esk)Qbn)Kn#b(nV zgr3S>&awE$EnMr;`<2OOdnhU0Af)(IY3t9|ILne2(pPru&9Km2h0&&w*foXN=XzP6 zdP{%n>%JYuzdyJieevW6v)Z#;Lp%Sz@lPHr&-9*U>D$MPzIj_Kq(sQFZoix!P|V|I z9H&1SDC5??ewz09o8}Ukh?tL`&n#$p8{a5Bs{3^L_&gb|9IgKN?ne!=DLJ8Mo>VXH zx1GOPg|@J-FQt3co0o~Jt*bkVmR9@DIeJ(Ty5z#M5#@@F^ZNzOhDR8)=JB~!UE^^Z z%g{BJ@F?$g?pvBxxniaMR+gOP?a~HX*0suZDdVm2@}J~Zh=(i z_sgEPHH@!mq@hk%ph@oKVFTgW)5BuVZOosZduAyg|B@#lz2T89$449Uv8uS0!~^Q} zzRVguzsXY*nRK|jbJs$T>i0e;bNMB_EiC;Vtv)=l4S3nsI-SujF3zI)YM2YFGadx; zSJQd=>g~^D7H1LAowV3M9h2pzi&qKi z1b@3zFUI1EEx6SBUP1B+JbJ04vyYY|3~ zW9%51#o(#zJw-`kY`l5EYgK>8+cjEs9>pv5rq^u?dH<8zH044$Hk;d9rSZtQs`-Un zfwM01)y4Mg>$5c*rz@r~-1bg{_MUn25;=5QM1scs2%0vR= zVzGGrU3oSoDqFfzv;+$o$8$m@#G$?zrR9KGfspcB;jnf4hG?sAB zvL?kWTgHG@M5>sUvd=1(oYxNi#=u90ws2f4bn2A1|8!Z|ciC;r)=R5*Rc!mNme=LI zKjBT}&(^tmTV)^S2ZnDyUYRT!PO+k`Gr!YfvO@34UE|~7PM6R4MDIh{xj2&l9`&l_ zQsvI9sU*Hb6X8Y^8G89cA*|@i!=LY_8hfhD&YuhObv9erz-P97x-38y)5y^@5!Kze z^tZdMOMmE5v#~GkQHm`eKS-+XKUc04wJqHvPq*;nkr^+kVyc=^DX&S5ro|?h07_?gY!n@%k&L zrwO(h8V5xM8f^O%Uj}^I?VS>nJMlo@dvLc`^R@oRJ3pKWn!FY*gccoG?cZE*JE6f# zPr zx|g(`I@&4xPRF+MN^!`$)2hB{(Goo@Kfj-zpFduAQTNh0k|`BX5xXGg7R{pRGDdxKWoH!~jh3CeZ4?OnOH zygbuOcRSTa?14#=qsoq)=GWhY8=n?03f;Zeny*bmuN8@Mnh78a|XG#}quzI@EF z|61SrPu|apZ)lp1F6c7Z%W+TG=AQX1^+B)fijd>3JL={IY3- z8SE3kI#jdqPUXs4uaGxqD(pJFw%HD+1v(y_w~>{@HDADZ`=LO-^!*>R9k;Z27fdxw zUykE=wM}>LexalzUwPo~xq)pdUxuhG^$-OD7pU~$~(0f9AqLvrO()xI;Jv%(c@Pe|?ZI9s7oKgb!q>AXR z%jg=d$pI&O+Nl2f^PciGu9v`6>%u!he+vxCC8>wo@Lc*DOHrt=+}4`? zWh#|Fu;B1Bmhtq!jnOWXmc_#t-P6nqs%DL*ZIx==eQk5a$_azX9#_I@7Ww8SveMtW+i$tDM$7gDSCo;yFs zilXeIbtj?i^!>&1ybAbu`A2xh$1$m-A3HhP9Sx<*rsJ3qN~dE!OH`dQ z=DsFiP{o-Y`6N#%m-5Q>Q@sp-s+)M|oFGs?duCq|h(U&NLA{(RAE+laZ`cG-!%^Cg-zBznrF{P`4Hb}_y$ z{enz8gd8xI6H4n4vcuwa(6bI92J2F0DUC@x?;<mc@?jNWT5xRU&m7;^ zr|oRLLZbdia`|f~QJx>KyabkP=3Sm)+0PM7F%zNfe2kt{ztpB^o75gQxKzgS8PmO{ zIeorJ8NU3`Rg70n-ECFKj#6b@7zr<+g)}Ybw&bUL*%EGSlpJB0S0^uw38YB4TG3X# z*Aun9mz@9b{lb?TsgJEkQ%lZnc2hA+vZOimJ+5U`rDjt%)4YHBQ+al9HTzRTJ_=I~ zrl3|i?Y{c0f$KuAUFG$sI!p_*DAN`x_5LEuW7Dq~oYu8Y@~15fNZ#5QZ_Av&JZAcr zKzd)YuFAP*cg9XB7M!U)Tete_Qgo%hvr=W#mr|Oo!fmbH&xWkGj5ubQEBD&u^uUSx>+VrKD|5thPQ@M8aC^uGOLvL$g z620jhJz`vKi>g3iNnoC(=;~RDq5<-&0(PD59O5c_ZL#{xvK3sq^wK-I@ns3y4PQI% z7~aUSpq6j;jx&~#N)g|R9@jQ?B#X@?r~QKK$lyGd0hvw_~LSZFYSee}P`a(=|2bD0FS=RqGt@LY1PE_mf@K zE3`))BUdhJI3zCeaDk)oRR1S4^@{CZ93v;p>XM_wa`y~(Z$A>Z=jwDya#paKYZ27DcIQOr4G5_N6c+cnJsp2 ziKdSQ#X zfe}r8k@y{n4|e;H=Dp0Ti|gT9CtGM}8YK0#Ml-CM^>hBN_D&%%VK5OeDwrsk7??Pi z1ehe4R8@PY^yqpa9{9++YkQ`4Dd((N=TYBYdm3^U!1-hYH-~N9xH>G>Z%y##wSker zVViWrHwAH==Uk4;eo9Foy0A1ADc`hFLeAdy+*N0B=^Y#_jz@OZmdlszX~|~b5|;9} zS(&kVR%=!Gxeb~;esJqCmT?$t2(A&E~^19SQ=Bts)Hlwom%X-I$-lX?j2~7!^TVO0K_i5`+$#Bif z0}JiuZ^SwG^8d1Uvg__gm60m}B8CmI&rfch^T9`6Lt6OZy-2~>;_cI@x5 zaB@3qwrmym3WtH?(t&ELyY^mTsa@3RlKteI@tr?9VNd!+g{Fx*Rx1}v;;>=+yGJs0 z6WgEf*ffQoDyZExK$E?4M{ZH1+LMwsdW)}kQKKS`(7C<$gmL)IIg!mp@x?B-bx{@U zdNy2_*`~dc!>?LWb5i8j%5;xCRa5pGtDS1?a_zSTPb~;HtXHz@%&ZwmtV}ia{`fHD z(Y$4=GOLXs;M&6?2`hd0e_bAWarWR`@f?~{$oK`%$y2^O*+k4X9HBkD*M+(2` zPS4%VnR`IQJ0(Io_F%8bhQ8ut^|yvKO+VhWhh^T4aHvzz{Z`kB4Kp4jMlBzezGx+O zSAxFcC3@^glihWH2@OmJjQCp)Odd=DOc6{8Oc_iCOciW4*c>o5FmabWU|L|> zVDrFqz;wapgVDhlU<<$&g6Vgr)m~T>q{`tuRRW~zzINx>(AqG`i8VPg>(UAQ;rWW?J z8-?Fz%Am}9%!Qc7J3=U;*Y}tPnCc)YoCbv`$Swh=AZIA!xP-#)Grc+Yj{I$^bVNu5 zeZ3D&QO1z+1Ew2iRGcVMdB9Xb=mArkbNPf6dC#y(DG~JX0aKULe)2y=Lk=xWEzaPd ze^F)&(+(S+g%}T+>e&yO^D%xd;%|3Mm6y2E(8-5PORQfA<##Y;(a(oWLu@vc6wa+s zqAX5|l2)b}<{(K5-bYLmOhTFzevg>O7)_28=5o>^XmAyDuJsX95&J4nVmSqAK{Oc+ zSotwvsuGD;J%&Mgqf80`6=_j){V{ahX!akH{e-E9Im{tToe5#DMv9Y!*rQI05kj1v zOA3oN5c9N2vA>OJg}u{Z3qJI%jj4}))}2A{r%WS^mp+4>f6CP7&_sPtnX53dg=B#< z1L9x(4BGC|V-o>H)t44P8XuWd^xi<4DmaV%?*kfr#`M4vj7Vpyp)?OFF@iSk_A)8x zsj;-g4Cfapzn!@P`(#2m%OQylCIcHaCxki*?O-n8$U!GNn1NXP5)|+X9F(6k7hvyf z*@6pgc@B};+mYnfb4a#p_N0)00gd%Kkb=)qS^{l-0VBM|i6nI|z}Jt-7CcC%6LLfq zpFx~)X$p$zgj)G7B(Cj*QFK~P3ThWb^JoQIa3Q6aOg4ZHAAWOAhLAL|~3E_;LTuWS4(9>5Cpuu|5L%ACgX!!|OLigB7@W)hq5qM;;d zVRZZx+~VFFxJ6dVpR(+JSgMP6k$xWiFbT)2IFu+`n?K?m)IW#%|$#D4~DJcs69C zzV}QeG@K0s;PDo+A9esPRP_!*6h6W(<3&H-!Hv9+&LEjb$+4!Qp!eYYK8GxmI0o}q z`5uN#67{}^o9E;a1XU%>_>kiHu?xL&@PZ=TRuY9DoaSw@)6omF8y1pR9X_5 ze}Z`_nz6C>~JpwJyZXyZZ1Y3ay7fwavcciHl_I5Yx+a0z84{95M zJ*T#rB!kV;N@P}EfACM0>IbAl<|sT^3|dJsJjyi3sE7o;$I0qdreD7Nk-$;1~3>30{I#p*BNiT!7xgnWfj_3tKe z{#R(?cP}Z%zQXo#;58|1#v!Y9`blwc9Nad%B}G3Wb_|e0{~L%q?@2NI{(rmuiEl9e zZi6Ub0&+BA5OVs(E12ldfH}00{{&MN(I=SmVfDe^E?D0u#PJ<^^l*a7;AqPJ&UC~c zeOHd1OvC8viIZaaPY}N(NHJfM zCX8>3!+FKm2u$ms8yaONlx#g z-w^m7MG|lR%{1dkL}kC>xtyc?haH}a8)CyMECP%G_8`s0a7Lh`VhX~h%6ck>Z4{hYZ z=~$R4oA9GNQyMpF;(;J3=4@<)y|f^OKQFG2rCE`pj2EXV|MLO~FOl>A+cDs;2TT6A z3T>JBK8dn?a4GT`(ZUOZ-@KG;kCP8K!#*tgBeMCSw}E`PF2?QnKfsGB_#oaOr~d&% z?1M8|)r}vw!Ft?CQNa(L=5Z$l-GwHEuDymtR}jDzvHTSzzV8Yd{pVS=iNLp3l6cq+ z@SkV6l>0xEDB(#un7PyV{-g~O6@<{eR*`tAAk5S)ufL6~ghq(eLdBl{G;-F5?ZAVE z1YszX0by8YA-`&Tv-x^_T5pkwD%BXNrEIyaDEO+MsjHUs8bTci#^UJf~e#OIGRgA!%ewt zERK#41f66PZuCY9a=Igb1~HNbB33{WlRW6&L20P9w2&b1frbWaEMvJbFB$>N8Ko_Q z%85Vo5r z^T({yh^r1Nm4jPwr;|cl9;SP51}V15LkV*~AvDnod5BTu04Yu?z+UE@AuoU&6krIV z4zjTc_T>;M=4HuCAq7R)YdKJa5@aX+fV?sRsOX3y#PJ#teoDyuu)GLTJ|xeL-hnfw zbCiuGkgXDs9XTYSo&cY0C5Y+du^D7U36dx%cLs4%h9%Z_l1*qx!1#Xy)us%$mOaHT z<3`L}=!Sv{+{mDC1`bt$W*40%iJ~g>w?ze(TK8EtS%d`_6G9xFoCCYXW>ttRsc{CW zQ^gl?ZrP!L!kU$(5h#A7FdNtAOsrET(YYFBK@>V0vca97T_dUb*- zqwCg?ek)A1B!vEZSa?`!p~NLxipWwO*W=u6^;c!9!%dp3|EhQDxISmI&0l3Y7gYGt zKWYIwGZ#Ybu=}Hw(3iQm0p|jTzsf-a)D5S<^*-5YQP4#VaR1@_7yZz{jW|=?{;En` zO9TaIg2UbAf6)a^*be4-pk7Vflk?FUE!5|)#XzB2;L{cNM`@tieOkPzSqs7DQWhpxPr(0xM^)(59fr1Xu{K>+|tB zXp0Umh8F7LiX7a?e?G2;Vsv3cT<1rYKGcOAD)T3W#(c=Y5_oN&kFUhGuO_Za=*4_+ z_lDPYLTJ-rwWb7-BAE`)oi`Drcut4a`Yw_XwCp4XFVbb;W}KG=b&!f9Ly=H__9SiW zjstqE2if$VfiJ@JnWV5;0AWy_NpXAu>_9{aN&_;b& z)X@uJIP^RSKXtTWIYWlZ1?)<)j zq=?@KL-XhOp|%)&-X0|IJQT4QCVlWCDLNLzJoA>4Vvz|fnW{2Ub9GS?%6t?*L zm!LC}rqJvDDx!29cBYmLs?`+wBUw)f6=ZvZAw}NM-3)Hn*N7gQ!4w@ggT&f;n-Kn3 zM-vH!8yOUIbsY?w)UAK!jdquGz;8j;)tSRR_coKwZ+gVwM;+oYTc%Z;k;;mAC%E80jm`tOKaGCd+oHii85j2m8VBR z8ARE})BnG$*AlYWtmt2Ciz&lLCUztHt?*@7-qjg|Xf}HZEQaIN1eHb3OCa$^ZnA|C zs$K%46L*^=0@g4chE0T6&biY@A92*^$)F3C`U0rh8sb_ej5ur|=9^V|ylAt4u@w1a znr#E)fg8>!^RaPa@d)`?pU20aaBdzY#||B+)2@H3;kT-K?pgd zxfIU#7ap?3-*ZUrQn=k{9}-;#?^isnaBLnWNMAoeJh0sN#B~nJTn0T;{lpgBXow)^ zhDq{j(1ai1b`X&72tgFk-cKfiM2J*$*^XEzV=Xm z;SV;JK-C0!H^n9tM0J1(nEXkSxsxW6DAoadp8q0Hf-+dxV< z!Q&bb1TrYyb%5-DNE|J4!WVG1E6zkhau$No2xn*l_omtKqcmq25Uc$J(MC32 z;8VWOX69~MkwujGV@D4XS6SqL5E^UAwBbd$E>Lyj;Tia37LCy_ zNyM=dR{NvlHiAfaIW%5UK$7k}8(|bokex*&xw0G{g`3Zkg6aARIig z#!BLRl*~az}MfyHa{IMMc z_`q}b_;a#k*as##?FA`*dD#o17A=@Ue_xnFi3948nmIH zCQn#3C`-K?mAQrz#$aL;?Kz9EohzDl~hb^)8 zWzePH5LDSZoWYsG`5%%%Yl%2jgK$|+UGD!l1+58!4U3m|CaMjB~zL*mU z*rL8{dr5SI$5sf1t;aPupZ*VBS`WM6k;%Ufp!ktMFs_Yxu0;9a@ci{(VJ}1^v=lN} zVLx+oFzvJLPkjaxm#5wc+cmbjKAwIQ%_ zF9q21Ae9hkaV&TSR$gZ>g0>O3JB*FZu+tH2A%rZv;iGVGs67|b*$9p&wvc6}5%#?3 zL6|+fxvE1NXKaLsB%|16La2@K#Qw_ zNhO8YCJ$#7hTs40xX z!l07KUed)s9QFb8UG{vak-)O>bJCvy4#x$M<8D}$@Q{H44u|f1*vBq2$Hw4Srf^8r z_DmA~+G{U^bRwXMhJz#-%mk7~keov#c^Cnw827_$!Hec>1|pYDk}aDdr{O24KLKpo z0%_8+89JkTWCrm&1QVyV1s(^F5Jx0zvN2m=5Yvv&aH&3GPeJYAf^Ep1fsf@tmeC^t zAIhJB<0E0=yB3h-Q51ag*pUa0F9^q9|6vN!jDk(Jq=@Y(j*_Dwty<5pi5>RsEGZOE z!%A2d4NVwaB8l&Ldnt5^AmXKL9|{_ah9-Q=NMaTPI~ZP$9>>6&HR~cw$>|uVaHWDE zIF@pQxGEvbSmLmBlc*z(sK=PRXn!m$uns2&B)S9U7!*JH919C09hLsi?Le(|Y) zF*g$24!s*J`2RSF!0-j+f3fi*Xqy`~ZimTMD*FFeB@ViqdS(XR8VB|Fo|{1)5ybE! zn=HlxFR=wLN{ELhQp#qK=kaiwwYfZl#9m^;+TH>Em|scahnHbw_V0iWpQ>ULarBw+ z(Y!$tLl(RcuB|0SCJQ>yR7Z;VT9}ykEU4|$z$TK!H#03vx{*!zkbDH3a7W@H@w{%s qiTPdvE`WJ9lMX4jnc|2$5voYtBZ!eOd}G3@uFsk!exC_nT>cM8Bozu|Uuf#3pB@Ki(o|FGM`bOyZ#ZdYTt9jVgV&+nne&6FK zPmcfo@rAj&nOXk(cTSK?uGyWK?-_iruP~RyTzocK@cT>{^V`(r+n+lZ%}!=sc=Vyn zTeIYwm-~X)A8%jv6n>ksL7lb22biLj^)t-rXC{pO!$;4qLwC6hDbFk$b`I8`vOE&E z`3T*0Q+U38VaV5I?{Y7%Ztt|oI^mq)6q>t1pOk%SL@Dmrk1$&jnn^!s z>uudWm6dm_i2hl0e6lnU3-DCt>)v8+Q<$q{7T9wxP-C;a8(&)k8?M79P;Sh>2lp`;a1kUacaZ2$2a&>eN#xU$S*a!yPthIPGR)z z@-drv?q8)T7vgzppC3Qh>Lsm)6fzg{ZMr#SV;}X6_sadjhh9dYir%5|CckC+3c<86 zAIj~!^3Rf;#KQOopUw)~$XdI@YyD|Ey|h;;<#qIecR4wI8Y8{zCW$T>Q1KZu4K~q zxhf}K)7E!TOkS?u%JOVmea@@R{exV4V2@4G{cy|oJA?8bE3a2&>E8AC&uIv^EOO!Q z-6*Hne`1aK(73bUUYacL6L|-TdiOVLr4`;xw6C81`SmsOzM7~y_wNtnt&$au8&nQQ zCfzf3nI|bahhnYixkjNuRHAO4!{f0;J!ZH{gKcE-{-#UWF37W}%Ir#lG3#8o&^`Zv z;GIre-YMMlIx0|i)6TfzM3!Gl%j@*{3;Ler>`U`yS!li-IHbCDr(O9IiNyRAi#aLN z4XXpg)OY#H?zutA^sQPp?>ofS>9n18TO*} zJM%)=+M#?(ZXp5jt<26bey)iYau3houp&O64NDoQ`R16r_ zJd>4@5Y4tMSfSq{pW&HTeEHcLX`yqUo#nb)Oj!jq`I7|?oqMn)H9E(0EcL%kSxyOu zJW;ewPCuMWtzEUX6Vdim~r&tn&y#KO*40%cg0ibqd_x;YZ9!| zj2mqCHuHZ^wJS`S5-!}gc|?5DdPssvqI^~A!(-Wz2afUzQvJm%)>r8UH-X0Z&yC$ zki&XO{@rg*te4(3$md6{9UqaPNFdpdtMY1^YnfgGHn$uf-t17dYyUWW+HNXqA&*wt z0Bz{>su%Jq4JTuB%THL7rTP7J$?m>2)=^I0x(NZ7#fFDS0T%LsXVeSyt~sV@n}2BD z*A%{ta)$bFZS+;^U82~WrqIr?o3?o-hpnl_;rGv}ZWOh1DZfsElz%VpqPSCa_r3FH zO*9;tedoK{WDkgsn7zH+-7#Mz+3~^Yf``aYP7R?WE@zI znnR}t4)nTToVh$|8gnv!I=wuz>!F~0pxM4AsNm}e)A=9p9bufHxs^sK1;n}HM2A7r`bd>NH zyVkgA!`X;$;fvN}hn_2|N6uFw9!V``k%Uwg;`004l3u9Rik(zxrbOEvP`uYlS-Wab z=Ii#Z#-j_O4CMpfuX@g(a$z?qwQHN5Xf;<&Z+$z|d!m6_o4H4C zBP-*E7FSdEBFox2l|~Qte~?NYc)j?e@WvTALD7c&Px~e8oaaaSR`cxKsK2XY^Yb-b zv0b@T%i-R2$FAK;=%u7MR=yH_D8}rkB#npr<Q;xU?`W<_OPy*s21J-HMuJp?%4U0k;fha%Y;A zZmI`ueJFo$UCaTCFX=y=M1MP-bedOBZLp7w>7^QNX;r*(a-Hvuyz)AqQPoqFnCxZz z)*-zs`8|icWEI=_#&p|nawok%cgm=kx_0(H@3t)uf|b*lzTCChp(!NuwAZxiM~zYq zr*H15Ix~NhR0UVN<1dZ4GT|+U)5ohX7?vjG_^gn-n!b2UM;ea0J#W%)59u<6%sXh5 z^%P2O()IIYGLgjwzN=pAEt#3@Xg;4;FZTG|L2DXMfa!r98{P(qH+6rmc3oZZ#_EX$ zCFJZt=Z_zKpJSQ&6o0V>lYvb|x(j>ex&|M4QB!7JMu}(buUdazcerR~ywJ!Y?C~b- zxvcS5>x5^fsuV{N{qEumX|+qf>|gqm$G14;{+0t3Mk>4R$=AKf$`Y*P3yI+2OAvn_ z?RD{2p=;mC+oiZEYBZEiVN^Oi)P!zT*Rz2M} zrRDZU@0_;pA;ziFygr$qti4Achf#bhvszIUIy*1Qj<;sq^3^J)Z>4YX)VsV%fdjtD zmgH-3kfm+&B7;9!PPAGVjP^Y{?OM=~sU5xNsZ-OmNMe@K-A_YQ`>pmpM#xYSWo=G= zao|Kl|G_NHRO)OKzs!k-?{BwjG^Bhx;7mzvT)6#;cRU=54e_NN{R$bg-fZdn!U{L- za=+*_Q!QNITx(pyJYPDUk#_sAoe#zL@Pik9^=f(_t0AMhjH**kRM<86CVR_a-y8NU zE?pdb`f0fe%aPKp>61UW@>kB7`%pTy*YbB38kF?-+#uXQNfA%m#2X@e=jW!WX@$$4 zDpd9Sh}HSj(f2`dD}|y2$a;rQ)*Yk_W+!^V*7Vueva-FBSz1=KXpAg7K1YR`y4$|- z5!WJq#xI_+LfKh$F_?(%vlW#kGD_MWikDJ4B))HV+qV>}Z0QX8yp8|8um<^-2|fDE zl@fJd+7b0EpBR_e&XYTfwUWjoqjzrKWftn3=K0tyF*4$<_~cTCS~^I{eaM~>9w@ScheFl-i>ed`#7~h%3oKikT?I~lXImdZxPju zH`XQTUi`A|vrqC_%*8^lQ=An(|IpsK>f#>n$?_*W0><>t-!Ycgb6zPd<}G`-%8o+1 zuafLLz5T^w9g8{Xd36GvhP%51J0pYNe~V~L=sWcCN6A|1Hl|p@q>{+H-YoSSULA&p z_w(-EDb*p92ItZ#M`XD=d-wFM?QQWdo0~W%FIbGXyW*x8PNPp zXN8JW;N2UkN^h^)C!GjT6O!`Wdv@45_sXZdLr&4XakEGnm)2T3j=VJ1_$hM0uyTw# zCw;_pcXYbJ%eRW#Zq`xPG4qWzv;%I-41RdvlGJXVZ*NWUeDYye+caOqy^O7a0%fYo znK=RSqq!-M&sg~|2aj0i`#h@N_2Js^gW2Nu!)s6JT(8v)Sk1TEY`gleR&}P&;&pR+ zv-4?RcLgR_XoaLduxh3_wu*%dz4|0lcdyB`;z&frvGb&K1xNKcQpxGHO!HfHUE<|} zdh%nrA-CGZ%MNaDJj3&h@$~cd5jou*bL*=QuG~*bDRXde)Qzu^9&%?XN4$$&XRzb* zE}@q7{wcL`;*(KZLN0|&Ui`)_vh%oDJtf)VBB|HX|IVHhRtBYtO&+Wpp)Q?Gc2<>A zBbrrrt7fkEcJ4T1f76|+yr6a?b0WZSA1$6${&RQt>H0lFnRkCpgdCe6;JCBy>7nht zZRmGIVYt+~g53GHZV8@vCo^^|CwAL#MN_3~TKT3&0fEY8p3@Th<{pXS&9(etc&L8j zS?UFs9o=F^kzxgoGB+bQ~W;LRu*uEUCH zhnchN+g8pE?leC4BYs_zvqW~Sp_7d_e_xGr?*8j-`{#uBL_I(7y&$Hnqk$28=tkLR zmS=0j5%qOlh626KTc(Jm23b$Jo>DDke&pKU?lf_HizFImb^LkqG*FlrHBFP+Rw&Ecb```=8aSK3@3cqb+F{gm=0Z> zc?S9NJ=#j)>gjl78Funv;ruifg-cD}QR&I=y6~ut!%VIV7q`thq4PXbL@)g3Vpm)B zA6swy5;=R3&%f}Y+2@Qqj&{EGwy&nP3Dyms4iGa8NC^S#%vg^+DLWWM4x;lDLoY z$d<6LMsg#0KkhSmrqV4WZ>c4@Mw_J`=y$&p^yph`U2;jw!(oNEPrYA5PYf#V>eR09 zyW+u&kE}P_?|aYFq+4fU20bUOt@v<^1`jRIZ7_p&>{D_8-^%OiOjh}x4YwJ7jv4a| z>^lxVH{Zs^S6^Lr!k1F_MY?QW(q^Gc^=&Q^s=S$++5Xkq<=pU!q4#UZS}t&#@ko-QxFSzv!u3w5D74bJtzi zw@AYOROwDN^6AzCOq;Wde>PT)s?|_NPQ5#J)`;~Z&**cGTRg4XI1y1ggx6a#Kl*Rb zBR{;e{QHZ>?sYq~CJ)R{f0aCWXn`D8kHuBWk40+SNne+#rq?h}QMtKZc5bB%6zEct zRtdIHYFU|Lb!MgLR)_E+EM6UrcL=MPc~6_Z(~6+4g3FElQF^OpQ@2Q%asEAd3G&SL z)7+^;+fTo?-m1Z4las)wC)J=S)pt$ChkyOWJ+!Z#!^pl<*be(@k8(SOZLsP2XrNP= z#(Wxgl|rXnbd>vIQU1g$TE<_>_CVeWO2v%za^^l=G5;b((}l67p|9Oo+2j53$BP#n zI>+7ME-`23s7vd6??S~Ye*eP?2aLLnq;E5Flkd+ojDMS_rjzDlZ@F%wfIsO+|NIoy zaxU%rDwFYsyeIj{HA8mqy+)-|rIq?@k9Br2b)(P=sb40JV*XlYM=}*I#SXj^d9*l- zvNrOTBWt1m?6FhasozX)DJaz5Iu^zd;UlG33Tmm6bs~=P&k3w`2>LvGi&Wjl(~)&+ zoy#wXovcxTS4JEAj(9A$<2NB+j-&E(Elmud?k(NHm)cnS=v_L@qLOy~rsoST>fU*A zd`#ZBQ?))<`LxZfJ&vuBJ#9f{!I$yMS5y zpzK-O<$GbLsYS7IW|!GP=>#G2$C4oL`Tf1=#)tZ5d&IN!YWMa9i@jW#cPH48`f}T+ zgD28A94tH;VwM&>ul^I+UpnVXCNn017XR^(6xY+Gig4r7O&m*zx3`{Q)7b)jau%FJo`XxtYA0omZaT0{EzhXqD#%_LuDAE3Uymvo)%)U?E;B12%L z7uX$9YW~Y(L8mLeD5-m^=`vM)1Ke%uAL)D-d9m?``@qHmW7pB3xT0gj-REzvzUMl+ zvY^~>*njTm)-tdB_#bso4r(Y2W@Mdz+O*El%R2U@_=cl)EeFTH_|k5Mkd~5ui~XkzVUg5*P4{S4(GmfJ8edGQeMSknyzf^( z&E+u1)B$^4yFO738n?64WWK=$@Fk zB;hT8Mqh%NN#jBRNw?7#lX#Fr8{HWbkjI%Ks%xV!!rm$nVu7M8KT>Ij&PmERkw-!8 zbbYK%g%EP8vSLW_Ih~AJ+o3BhG|^6Hkj#)p2Yi^KEc_!Hy~00o5UmqF6j4Ga-3#kl zKs0c*i_V9zF8V^OUzdX{(32HGN1b2_JG$sf*jGKa&kU2J5yFQiD~0#1jd2;Ui6GkY zoNkCU8?uQ2QeG%4h;DtQi=i)zWW~s{*#Ej05v5d&WF?S-B=kn@qjMwEZn_+{)tK$$ zL6yd`LMX8tx_W3rV6nw8@#i>sX@(Oyq}&5>dA*bn%@(p`6or%h7Hpz~-uBS7N%xW1 z3pyR^vPR-B=*o!s0>*1J?y0~BrVD5gKlfqB2pi88`eiR$BNgn z1wUeVLZ0>XK|?=1{>4IQNk6n!vi@Jpiv+wOE{{kIF|^<3pU7_U!HX)O;eJTcI$uH< zzk+1{?nex1?<<&TRv;m|L69_%*lS1-E98TJ>_Asv!vrsGM!v5h7RqlRO3qsd5&nj5 zhS9eYqVWxV5$SZ!0A#Ri1R@R4=b)$o=rw#NA)0Uz6p0IYbSV--n)(Y;LH{i*^0_Di ze~5zBjCu=mwBAjS>bKBeP|V+2F%VG2L2%c`5`;ev^7Hvm$ooGTlQ;;ConjKc@YzVqInMPoN_YldC`w8Lp9`@@9ix5R1NLlFBduZ`WCZc_SNjGJ|9`+ih>tcJe z*hB=~9ELoKL$8M6SUQWSAK7)Oo!t^gl<6Ek1R&$9++-Ehofo)rWJOYAY!BR<=BI> zY&Q>z7^Rz$ZlID;h_ZMQhl4pr=SA9MuzUi=|6&uY;1UNJzXZGf!x*fp_*D+xW<8FuR-ZQi*{=qR^s(_4&VG6kUs6bFn7rb@GULn@X;seOR=Of4sv;dz8I^% z#X$tiiB;CdR4X{}-AOt>+B69>DXRPzn_>lbImq~3$j`3V(7(|q=zmttzdl~%P$Mgg zGCskaCTlr-W_55drv89>pYeKU?s53^KEvT9)xbg4H$X23K0_n#?*EHR4`V^i?7(Rj*1W~Lw@q!tch*8->7mT72sNgD?)pN5%xv=ii1yR0Nq_yT3j zItk+U1@eRMIU($yLyA}8?uFe1!M?)y$9o9j@D(19j=hBV^%e5^##h)5J`iN# zcNp}?zhVzAT0at==ii~*vQa{4{GijY+A%`#jYH20YU6 z4s?IhjWJbj4idsm5k)z_VL*JS<~Q9PYZ4;7;S`D>QY6FASomhh_Gidpz9Jm1t0ELJ zG{Vae%dP{Lzc`1>hs5AP{3M1xHc#?jY=n(TagZg_ls|{3Hr64-f#or%szYHD1$?iP zk%T-&isOO*O%5-x215#nB*2hIDqM_Za6j?oVt8QNlnGX?M1g$fVl2Y;tFQ?VGU8?! zV123_gvHG;!m88=($CFUjQyHJ2qPXCjQ2c3r1CHpVx{VY7}cckqkbNSE_Pm%O+?XR zUWPWdNt+;7wIPc8aq>xrO?c7L`4nk9c-mN@E`bgC7*tG+N{EeAh;0@hxQG4{T^h8r zvGu=al%PI^^X@Z3BkF1K!|;|F;6ee#@Wa5@7~(<|weT}^Nt<&77@pWFBOIxrcmW8D zkO>iG2NP)jg#h&EvzQ=if>8aF>EA^VWEf*U=4`=_9t*;Fe=gx5Dnbk@=?QWaVmM&C zEeS`pC54O{h5oyYb*}tp*msr_rGBrZNTGN#bpCP$L6mJ^IL$yvkmF>SjEW6~2Pp_M zXqbl$y9h4|!^ungzr>Luk2-~+nP+f$!gF3xgkeaULHWYa!WI#jZuT0&Q7r<2y5+)6y3Yjr0?p%~97%>XrWHtdLxLf8nJ&Qj;>!$g;%0L>8i%n?i`5eH0;dTo!t7*h>)pbO_f3PCC;F zGCPAJOgs#oDG>3}OaiA-U|!k>2@!`Ve5em6W{22B8mW_Eo$ej^CsB(IvkUN{jMjVm#GP8mJyk&%tyhLNrjrQLd_aL4+3kg4RpZz=l>?`zL67Z<5Lp8i zSdVXeIDB-Lf(S}efhx>2HWoo6II(0A#8MT;$8~@Z&Ic9Xp@cVfPZb&q&LHsZLxAPg zpw_!gf`qHV2Aj%a3m(+3#xTV?4&g)@DIQUfLJo7Ff@(IKh@zr73_a2|RHDXEK{In8 zY=;ry?KuV={P~_xt;*m=JLf{@9!Ck^=@SYRBB}rQp5wmuJi@1t55D>HAdVs^Yc69R zikZhS#I#Ql-j;c=v*EJ*XGps03}aF&Dwzj;!{7WULml$ds{n~>FevDF5k&E=It+N% zU7W1p3W`=lzJjWb>Ei?(SpXk7E( z{#Exh8C0&Qp+8C$QM4EfxQuyK@uudY%~}j?t`B5Ylwdbc36*Iuy3E-aY14nqmMy$mPL*c}V}Qw?3vfjI^& zC+hsrVJyKOSrNixK4hHwNHm9vRB zT2=)u{>JfC)4!M(`BLE&llsQSg6Iwv7HW#FgT$+})sY;Hq0bfL@K-%@))7Iu+_0T9 zXb{xRPJelYs}31O>H;6d`8}6ETnR1EXBcs5xcybjymWX_nm#PhHx5KbHil5~lRi{* z_uwpQWB?;M=gEn(44}b$FHSUSz%bwnTmKhX8baPU`2JNW5XSo<9Gbsu2+c?N|K-&| zIs*7vM@HB};GLm=xzaWrA!NT05~?R$2RXXYl+dWq0%3I0jv_%XgF+57&yAxu@7?SaW7a@F1Kx~6|A$aZT0NUS& z*mMw$^H$pLj~Cd8DQ&<%HBjg#nj|tcgNY1={!_3y7_}^B_+aUwM2kIJX)-9x6vi$P zP7v1!+MjcSjNY2U2n*pT$Gg@sgWIVw9Nf4_H-ka#fL9y1_+-Ygz#`$z1ui_zK|F@j z8W(bVX!5Av92%EMA&AdD=nf7gGU8$VGp;c>oAD~XDOWgMy4raVcvju|}EjUaQK|@Pn1ieKZc-b;I*uP)oAdIUt zespme6ufwe1OG1hFW^cR(00-l4&NpV2twC&Hd%%pyG@AqRWJ#LB_7l}I8jA;mheny zze|YUmXHvkHEh9)D(j(}@a0h9Q7s3SyAO%=6vyOy99V4yY;R^g61RfKBXb3O6QDKY zLI-uPfO+lc!i5+1xgW1XL8s0c!u7!l5_a}Ulwb{^`CtVnm`^?-E}t{}yIXy&VT$^v zal9Urx{6*|L!unIK@nF8l~{NUTkxUnt6)Gn zwHze0!BC7i!uwaj*4t^Z5INc~W+UJN=!g|V7*TCt7-oW~#+K-b55AFmU0HSveALsU1w+))^P_DBaEE??vWjlL_Z` zI`xn!Fk%O%``eeufx%Ej+OJ_ybbA;@dp|+s-kOP{JZH!}Dgz$Px9s8ZdvJj8d3-b@ zqo4M$I5I4~YfKSBfdP+| zo-erY!bZR0pNi-)gRzwB@r)U2$+D6}R7ZG(i~Tl}#4l;uT!RbE|K((q>A=w8dMmk% z%_-=;1Dvt4(*H-cTrM(yRi-1uitC}=|CJQ_?Fh&Cefhsg%n70yu!f<><*)dEq<|_^ zmkFWfH82Re^8dLL*F)9+wKP7GtNPilXVEb4V)Ea58LW`U3GkNR_`6h;otkQU8* zk%bq0#Y%IA>&xjhLJS={FdvJ#V#d?inFZ*iLO?le@bZ|;wV+J79R9m*&KwCYsHU5 zU7^$H91iU53M)J32tls6!p&UnD2H3Z4K5;w@^GSxHoHN7RfJI4 z!jMJN>tTrtY6xQP4X3R@9b51tpZiwaX!a%;M3pxbME5v+qYt2Yc^_zgrk=oCeBk8B zen5zHU)W8pKCqF8AF+u5()VTPlU5^=FN211;BTz2mGJ6z!WM+)Ae;Q4tIRe6_jN%4 zz5Sq3*iy&hDFs+K`DBmB>^2s1LV^i=KV4dAKS&t3&AW{G$0Ne2r z|I|bo0dPpf_TzQup@#$iW#;0+e=<|$HC{j-EgiPvLrVjpO2``yau^6{2-O6@%Zfim z-Uq@Ue!OKD5ks~cU@iR6)<7t7?t_&Cx{wI7yRrdhS35+M8{PolaAbxFv2N6gjOaly zF~&!n$f3hQ_{DgH5WglMA*OM+?bsiZGX>>WZG_ya8vhSSqYE3MME>M|KnRUa!wlgY z+n;T!g!z2_zw6Rh2(DK!9?I$e)62n-<`=&FACNZz(46@LkoP7SQ_OclRQ8V3pNKh_o3Vq2WB%{HQ$yDtyOq;(<+aFVJtjP{voXke?;cy5fhe22e;T;W|%->`yir$1l zU#;*a<}W5A<#1a*WEu`QHuwX`cokg`xg{ zF&QFlRfP)=Oz1BDITyLs(Zz{cL5=^^S`Gi-B^maccM617umKkei2jf+CF5Yn!;Ak{ SiP_j}%>DMPS$y~Dp#BF}uk3yR diff --git a/objects/o_dialog_scrollbox_horizontal/Create_0.gml b/objects/o_dialog_scrollbox_horizontal/Create_0.gml index 1a4373b8a..8bfa264e6 100644 --- a/objects/o_dialog_scrollbox_horizontal/Create_0.gml +++ b/objects/o_dialog_scrollbox_horizontal/Create_0.gml @@ -4,6 +4,7 @@ event_inherited(); #region max_h = 640; + horizon = true; font = f_p0 align = fa_center; text_pad = ui(8); @@ -63,7 +64,7 @@ event_inherited(); var hght = line_get_height(font) + item_pad; var sh = ui(40); - var ww = 0; + var ww = 0, tw; var hh = 0; var lw = 0; @@ -75,32 +76,45 @@ event_inherited(); draw_set_text(font, fa_left, fa_top); for( var i = 0, n = array_length(data); i < n; i++ ) { - var _dat = data[i]; - var txt = is_instanceof(_dat, scrollItem)? _dat.name : _dat; + var _val = data[i]; + var txt = is_instanceof(_val, scrollItem)? _val.name : _val; + var _spr = is_instanceof(_val, scrollItem) && _val.spr; - if(_dat == -1 || i == n - 1) { - if(_emp) { - array_push(widths, 0); - } else { - array_push(widths, lw); - ww += lw; - hh = max(hh, lh); + if(horizon) { + if(_val == -1 || i == n - 1) { + if(_emp) { + array_push(widths, 0); + } else { + array_push(widths, lw); + ww += lw; + hh = max(hh, lh); + } + + lw = 0; + lh = item_pad; + continue; } - - lw = 0; - lh = item_pad; + } else if(_val == -1) { + lh += ui(8); continue; } _emp = false; - lw = max(lw, string_width(txt) + text_pad * 2); + + tw = string_width(txt) + _spr * (hght + text_pad * 2); + lw = max(lw, tw + text_pad * 2); lh += hght; } - dialog_w = max(scrollbox.w, ww); - dialog_h = min(max_h, sh + hh); + if(horizon) { + dialog_w = max(scrollbox.w, ww) + text_pad * 2; + dialog_h = min(max_h, sh + hh); + } else { + dialog_w = max(scrollbox.w, lw); + dialog_h = min(max_h, sh + lh); + } - sc_content.resize(dialog_w, dialog_h - ui(40)); + sc_content.resize(dialog_w - text_pad * 2, dialog_h - ui(40)); resetPosition(); } @@ -117,23 +131,32 @@ event_inherited(); var _col = 0; for( var i = 0, n = array_length(data); i < n; i++ ) { - var _dw = widths[_col]; + var _dw = horizon? widths[_col] : sc_content.surface_w; var _val = data[i]; - if(data[i] == -1 || i == n -1) { - _lx += _dw; - _ly = _y; - _col++; + if(horizon) { + if(_val == -1 || i == n -1) { + _lx += _dw; + _ly = _y; + _col++; + + _h = max(_h, _lh); + _lh = 0; + _lw = 0; + + continue; + } - _h = max(_h, _lh); - _lh = 0; - _lw = 0; + if(_dw == 0) continue; + + } else if(_val == -1) { + draw_sprite_stretched(THEME.menu_separator, 0, ui(8), _ly, _dw - ui(16), ui(6)); + _ly += ui(8); + _h += ui(8); continue; } - if(_dw == 0) continue; - var txt = is_instanceof(_val, scrollItem)? _val.name : _val; var _spr = is_instanceof(_val, scrollItem) && _val.spr; var _tol = is_instanceof(_val, scrollItem) && _val.tooltip != ""; @@ -142,8 +165,11 @@ event_inherited(); var subitem = string_starts_with(txt, ">"); txt = string_trim_start(txt, ["-", ">", " "]); + var _hov = false; + if(clickable) { if(sc_content.hover && point_in_rectangle(_m[0], _m[1], _lx, _ly, _lx + _dw, _ly + hght - 1)) { + _hov = true; selecting = i; hovering = data[i]; @@ -153,20 +179,22 @@ event_inherited(); if(selecting == i) { draw_sprite_stretched_ext(THEME.textbox, 3, _lx, _ly, _dw, hght, COLORS.dialog_menubox_highlight, 1); - if(sc_content.active && (mouse_press(mb_left) || keyboard_check_pressed(vk_enter))) { + if(sc_content.active && (mouse_press(mb_left, _hov) || keyboard_check_pressed(vk_enter))) { initVal = array_find(scrollbox.data, _val); instance_destroy(); } } } + align = fa_left; + draw_set_text(font, align, fa_center, subitem? COLORS._main_text_sub : COLORS._main_text); if(align == fa_center) { var _xc = _spr? hght + (_dw - hght) / 2 : _dw / 2; draw_text_add(_lx + _xc, _ly + hght / 2, txt); } else if(align == fa_left) - draw_text_add(_lx + text_pad + _spr * hght, _ly + hght / 2, txt); + draw_text_add(text_pad + _lx + _spr * (text_pad * 2 + hght), _ly + hght / 2, txt); if(_spr) draw_sprite_ext(_val.spr, _val.spr_ind, _lx + ui(8) + hght / 2, _ly + hght / 2, 1, 1, 0, _val.spr_blend, 1); diff --git a/objects/o_dialog_scrollbox_horizontal/Draw_64.gml b/objects/o_dialog_scrollbox_horizontal/Draw_64.gml index 249527676..ec0793dc6 100644 --- a/objects/o_dialog_scrollbox_horizontal/Draw_64.gml +++ b/objects/o_dialog_scrollbox_horizontal/Draw_64.gml @@ -4,11 +4,16 @@ WIDGET_CURRENT = tb_search; tb_search.setFocusHover(true, true); - tb_search.draw(dialog_x + ui(8), dialog_y + ui(8), dialog_w - ui(16), ui(24), search_string); + tb_search.draw(dialog_x + ui(8), dialog_y + ui(8), dialog_w - ui(16) - ui(24 + 4), ui(24), search_string); tb_search.sprite_index = 0; sc_content.setFocusHover(sFOCUS, sHOVER); - sc_content.draw(dialog_x, dialog_y + ui(40)); + sc_content.draw(dialog_x + text_pad, dialog_y + ui(40)); draw_sprite_stretched(THEME.textbox, 1, dialog_x, dialog_y, dialog_w, dialog_h); + + if(buttonInstant(THEME.button_hide, dialog_x + dialog_w - ui(8) - ui(24), dialog_y + ui(8), ui(24), ui(24), mouse_ui, sFOCUS, sHOVER, "", THEME.scrollbox_direction, horizon) == 2) { + horizon = !horizon; + setSize(); + } #endregion \ No newline at end of file diff --git a/objects/o_main/Draw_64.gml b/objects/o_main/Draw_64.gml index 975ddbf3e..7faacffad 100644 --- a/objects/o_main/Draw_64.gml +++ b/objects/o_main/Draw_64.gml @@ -2,7 +2,7 @@ if(winMan_isMinimized()) exit; _MOUSE_BLOCK = MOUSE_BLOCK; -MOUSE_BLOCK = false; +if(MOUSE_BLOCK) MOUSE_BLOCK--; if(APP_SURF_OVERRIDE) { APP_SURF = surface_verify(APP_SURF, WIN_W, WIN_H); diff --git a/objects/o_main/o_main.yy b/objects/o_main/o_main.yy index fa6e466ef..c26819bb9 100644 --- a/objects/o_main/o_main.yy +++ b/objects/o_main/o_main.yy @@ -2,25 +2,25 @@ "$GMObject":"", "%Name":"o_main", "eventList":[ - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":5,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":2,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":3,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":4,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":20,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":60,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":62,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":68,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":69,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":70,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":75,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":75,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":10,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":5,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":2,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":3,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":4,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":20,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":60,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":62,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":68,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":69,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":70,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":75,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":75,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":10,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], "managed":true, "name":"o_main", diff --git a/scripts/node_rm_primitive/node_rm_primitive.gml b/scripts/node_rm_primitive/node_rm_primitive.gml index 6e9ea6251..886e323a0 100644 --- a/scripts/node_rm_primitive/node_rm_primitive.gml +++ b/scripts/node_rm_primitive/node_rm_primitive.gml @@ -16,15 +16,11 @@ function Node_RM_Primitive(_x, _y, _group = noone) : Node_RM(_x, _y, _group) con shape_types_str = []; var _ind = 0; - for( var i = 0, n = array_length(shape_types); i < n; i++ ) { - if(shape_types[i] == -1) - shape_types_str[i] = -1; - else - shape_types_str[i] = new scrollItem(shape_types[i], s_node_shape_3d, _ind++, COLORS._main_icon_light); - } + for( var i = 0, n = array_length(shape_types); i < n; i++ ) + shape_types_str[i] = shape_types[i] == -1? -1 : new scrollItem(shape_types[i], s_node_shape_3d, _ind++, COLORS._main_icon_light); inputs[| 1] = nodeValue("Shape", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1) - .setDisplay(VALUE_DISPLAY.enum_scroll, shape_types_str); + .setDisplay(VALUE_DISPLAY.enum_scroll, { data: shape_types_str, horizontal: true, text_pad: ui(16) }); inputs[| 2] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) .setDisplay(VALUE_DISPLAY.vector); diff --git a/scripts/node_shape/node_shape.gml b/scripts/node_shape/node_shape.gml index f4b4e07d8..2f35dfda2 100644 --- a/scripts/node_shape/node_shape.gml +++ b/scripts/node_shape/node_shape.gml @@ -38,26 +38,23 @@ function Node_Shape(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 1] = nodeValue("Background", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); - shape_types = [ "Rectangle", "Diamond", "Trapezoid", "Parallelogram", - -1, - "Ellipse", "Arc", "Donut", "Crescent", "Disk Segment", "Pie", - -1, - "Regular polygon", "Star", "Cross", "Rounded Cross", - -1, - "Teardrop", "Leaf", "Heart", "Arrow", "Gear", - ]; + shape_types = [ + "Rectangle", "Diamond", "Trapezoid", "Parallelogram", + -1, + "Ellipse", "Arc", "Donut", "Crescent", "Disk Segment", "Pie", + -1, + "Regular polygon", "Star", "Cross", "Rounded Cross", + -1, + "Teardrop", "Leaf", "Heart", "Arrow", "Gear", + ]; shape_types_str = []; var _ind = 0; - for( var i = 0, n = array_length(shape_types); i < n; i++ ) { - if(shape_types[i] == -1) - shape_types_str[i] = -1; - else - shape_types_str[i] = new scrollItem(shape_types[i], s_node_shape_type, _ind++); - } + for( var i = 0, n = array_length(shape_types); i < n; i++ ) + shape_types_str[i] = shape_types[i] == -1? -1 : new scrollItem(shape_types[i], s_node_shape_type, _ind++); inputs[| 2] = nodeValue("Shape", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) - .setDisplay(VALUE_DISPLAY.enum_scroll, shape_types_str); + .setDisplay(VALUE_DISPLAY.enum_scroll, { data: shape_types_str, horizontal: true, text_pad: ui(16) }); inputs[| 3] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_AREA_REF) .setUnitRef(onSurfaceSize, VALUE_UNIT.reference) diff --git a/scripts/node_value/node_value.gml b/scripts/node_value/node_value.gml index f20fc60cb..a3174a163 100644 --- a/scripts/node_value/node_value.gml +++ b/scripts/node_value/node_value.gml @@ -694,12 +694,12 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru if(!is_struct(display_data)) display_data = { data: display_data }; var choices = __txt_junction_data(instanceof(node), connect_type, index, display_data.data); - editWidget = new scrollBox(choices, function(val) { - if(val == -1) return; - return setValueInspector(toNumber(val)); - } ); - if(struct_has(display_data, "update_hover")) - editWidget.update_hover = display_data.update_hover; + editWidget = new scrollBox(choices, function(val) /*=>*/ { if(val == -1) return; return setValueInspector(toNumber(val)); } ); + + if(struct_has(display_data, "update_hover")) editWidget.update_hover = display_data.update_hover; + if(struct_has(display_data, "horizontal")) editWidget.horizontal = display_data.horizontal; + if(struct_has(display_data, "item_pad")) editWidget.item_pad = display_data.item_pad; + if(struct_has(display_data, "text_pad")) editWidget.text_pad = display_data.text_pad; rejectConnect(); key_inter = CURVE_TYPE.cut;