From 489f3abe64fe5bb664b4a30106bd6fb2da16941f Mon Sep 17 00:00:00 2001 From: Yoshman29 Date: Sun, 23 Oct 2022 03:32:42 +0200 Subject: [PATCH] HELP ME!!!! button --- assets/images/desktop/ui/captionButtons.png | Bin 8690 -> 11114 bytes buildnumber.txt | 2 +- source/funkin/desktop/windows/Window.hx | 2 +- .../desktop/windows/WindowCaptionButton.hx | 11 +++++++++-- .../desktop/windows/WindowDragHitbox.hx | 4 ++++ 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/assets/images/desktop/ui/captionButtons.png b/assets/images/desktop/ui/captionButtons.png index c0e1caefb73963a71ab8db680144abd5e67cd0a9..d5e2dff2ad5ff018312d1642b15c54212cac0b11 100644 GIT binary patch literal 11114 zcmZ9yWl&sA*ex17Sa5e3T!OnZ$l&ho8r&_o+dyD&4ek;kSa1jf!Cis|ch|#vzI)HP zb$|5k>fPPdPpzlB_Ug5EjHPA zA3l8Q|F6IdJC|F2_`pmG0!nE5ET04-nQCg?zTTBuPRr30HX&0=XQ^u*>#FLMe2iu= zmjGgU=&``3*rT>JQd3jLqN{3RMjQPKjg81Z`iU3MVLwwmLa`wU4rvq)|ON_xpTz|F0 z%p_BB2qaG7qR&S8mt{2B9(LdJsuDzI)$IpzlMH8RgBe5t`3eBmr2MoP(`1s#^M?ZZm7>OKdX>eDEbap(D8cO{Ahu0fnknu8!?>>*Bh)&jGfh6tOPUDg;({u-0G zH*Use*2!?VcD%_x@Js`ZofuDZ*0#LyhinT0#$|*NyjrQrb6)ef6-th`so$lO@fOx)is3|Q}Yh7nqB zo0grW6x7;lQmn*CJrG0L*dg26n1c%t4lAN1&AiX@p|_G=sM4PUIx#3!|tK-stvqNSS={@bqOQp(dT zU8&cNUrFcWBt-mXoBZvl1=q}?KxRlvq2y~ZeXXBA#WAvdkX7ASLYYo4t?ZPgJ|Ffqe`JxJ24(C))ZEMPH;hoUWIJy7tH`+Vw!$7{rI8bn zmplTM9si=CogcCuuBj(mtzInhzz!iYGY(qN!d)0+>JVs;-*w8@vE<=8I&s9l<@&{x zf~PWyboJ4aflZhpFbcG+XWu{R96R{$@nxK@nQ@}zW0Q#pD|x>s*fO8$34LCj-bk)h z#r|cz3_F=CB^;qg4UR;bfAGv07eAFXytw2i`-3W^9OqZFF0L^D?|3f3-$XGPqBrKR zG8omh`y4baFISzw>$YL4iIV_Mn59%wGY$k$RPBM(X)P^UI=lq9Z<}hIKH9$BcDrs- zOt8_N^4VI+OsU4TiFS#@(m(TFks@|d-H$TB%nhElS+VJ;3kWep!7%#5PnkY7 zOI5DNr88FS5^PCb#^^?wYj|vEkG1LnrB5g7lfXDq-@4qCuV#R99StCyuXT8YXQld) z(R+kOicUb7OQacnu@`8Hh zbAL^^@gcsM;+%Q@oQuUjKml*z4P@duLcV>avb+>^g`q^ii-L_(u@~w1`r>aUpntU6FmEF_$?`w&90^u&r^)hA|qFV{Pbwx|T{V4ANs2UgWmiv3%$_?V!N4$bEcn5I3UTZK=musOO}zg6;PPKbZHi`k6gB) z0b6`DQA$bX#D~(4bo;|ay*m}8c=EY!^GHpFZYbbelUeMcYio7@7RdENuIGRpVC+I0 zJ9Nd3gu&ejOqNY9!2~&~=~a36KlF~32VJuH)b_9v6Mm3HplXmcyjN`RKO zNBNv5;#l@Cl4d&$&-pvg!3CnRE&=)1b$r&XL~KNvt`tx+9u){MWb`x!sfWn`m+Z>< zM}adE+~fJ+Y#PLr^MZUW4j9HLx9lB+A762xiVbG;i6&^;G~cfR<(e1aj;nwbk^$7h z9LPs>d%mZMt40Ztg+jZ}{_`!`CG<}S5oodz1^VK;7@i+k$`xi>=Eg#qB(qm{L<4!| zCKFG-J}yZI6YiC^BNsUzaEw1hjlM6n^cinx2lp^_5zG<_kmk3^r;ICOT-+rZ$qHY& zIt2LcaHnJ-_8gyj>4!Mnja;wJ6OQ4d1;{MlpaxuWPnN^`8u91R^*Tub{EqlW zl<4VXS|iH*@o*$;Z!@O)AiY0rG(RA}@2z-Q&z{#7z3vz^@yO^@ak%p)RCjPwrV3P) zIYC*5I-HnxqKUg&qGhp+I4#n=Y`QT+tPA;~8S*!??A= zTVts$jPNJuBfnhx6L*bmc0yWsQ7)UZ{py2)OjwqFv+2e#?oEHTvLtj6@Nd4}d{)+n zvWsn4m71Q)M0qKQeNI=BOZ;hpamTN|*Po-~8|1JS>O!*vSIXK%gd*ed=JCp;|_HY@G zNUOZaC~A~q63U2*D*gW2VcYfUYjdPUkZKHL)d@8gtu=%KdykkNY7M8oMw|o_sF6G? z4#nuH8QTAM%wB4>xm4(dcDPW|3n6KpGhHR7wwp4bT`u9;r>-_&BoHILUOq@JW@T>&e4yfbRLGy3}V+O1W{8pnKKr5^Mu$ z$GI7i6RF?()4kY}1Kn^{8(5rGPqgx;+fIEOY0#yGp`mi;ka!y@Xz z0tP+U@l$^K{i<+*C$C)<2yEFTA9`)&j|@uDVt@)H>jAf z5FC;PZs^F;R8jJ-ThnHV3cXLC~7P`8FkLaF9r+qYUw+`Po zYU<%sTlP6tc;IAaRzMfO@`|y0cv8Nlu+*5pBL1DpKa4uaa6fQLSqWSZ+kB@EGxTb} zd5K%l@%oSoa*+E(8YbAIO8?pZ{ADFFrdJQoC=>3x)&5PQp?Qxr%w#(rvVGc>dQ$v5 z8Eqm@Ml~VFzus3q_PxoehbZTgMk%A2M5`uPZR=q7H+;OLPCDHAc&fCrm zTcr{=`Kh>Z3`18_PEl$y@$W2p^^}X^V-h1M%TH*D2kDb_g_k2osttV4%dhYPJdp>t zj}kg#yY7dq4kM9wWENmi0%!D03=dnXmYBfvZHprMiZhRBT1$$ApUiPyrhg9I`^4LRrvmH083pO9g(BOM5?DPA2w>{iWU^cXzG~C z*b<|3Ut#dob58JC_W9rucLETmpDJHojU4Et@wK1cgW3i&@_mfclRRQ^COA4Smg8XqjH{^&1>>Zl{2t10_c zj0w%Zbp|b9YGSx=%W^IQgJ2{%$&c71G@p;Q*^F!OQfyR-!)#OTc><>e?!u2)GuK(2 zgq;kxYcC~gvvP1Msk)#^sg8!TZ%uvXkIykQo~D&qvy+jg#_ovhjTp&}R0MKsr&~2s z7HkhSLAD`jS1V7^CBFad4xG`*rYr?8e~kjm^%HERc}bs;(dRradB zrUWR)qFgL=Rnc;DHE#oSYTQn)()A;(FE0!!&gIbW;FMp| zK{}LfV02)B02Ixkazv2udYjU73n{5*!_IR4vMJ~Iq>EybAz9wo+80~d)uDFpwowmx zHvNyTF)y&He7ve13%OE(L179(08T6n-VDdj-X^rd5_EkG2xxjskb-XcsU9pw*WWd~hFNW|@eveM|E@Nf&S{D?yDs9NX1@JfL7 z@qwqx4o2=kc{ZPl)k1Z+fD$`$a11vS&8jD0RIygY1X``crgsjlj{(#UOyKLpgx?;*ce{)F6a(A9zf`V}!i3XV4ni3s0>ktqV5oCJWM=5~{ z;(;RiuJY3R1dVPC{?(z;`NvWrNtH6|T1*PP?Tj){;TD)TmDnhd3!0T|Pb^A4XUe_1 zMA$9N)LRI`zN{+b1{z48EorvJI@X`9CxE|oy)#HZG+l~;oey7SF{ez4J!Q8t+&>}I zv#Nh3S+8aN9|HNZzrT|PNFe@Df&)U1akIBwZ!~qF=#X8miO{4>ob(YnFU2f+^%ZJn zVm1U$7sAO-U62W|&h9#kH)$T)Zu@S=!51aE^7|?$7@;6nrihlOQ-a9t^r zK48-7M!%>(4S+5}U<+niGs=1 zBO=8yPn~S%hZnF8{hR`*QAyyz^d`p^$w`336FzC3iFc8v5LxZT6K2k!wtf>-AwKoD ztN!bARQ*mDD;l1-R~AFqb#y+4qIuY^`eTFQtCD#bEhSK}thujFNV7{{@K(9@@0vC5*A92~MK% zm!XY8r^|bul+)#kD3#%ezV_?lPK?I6yDn$rTjq7$xBGiBy(KUlE3IiS7 z-$@XK7Vy+?!BGRs9xPy)9K(Pb*}-w!XbBj~zt8HF%ek*d)G%g`2Bsl|krMjbsrPg6 z>2d7V@Haq-xS->_ilZu&v>FZe&14z5DbtjSBxXU)UBtyE02LtC`DF?lnrH_ojN__x z?(cj?c@>D%Ros9}0FU72i!LW(SkSW(Pi<~@lHUZruDh)HF?;?G>I9ecjr3?#6=(jv zvJIW>AG=;0(E+rGkR0yI(Vj|15txv@%HOt8lJ=@9)y?OFjTqhv@35T%ctK?4 zt>kr}90&T%@-bA_$OvxQD5P{Ii)4F^G;-gW$!(J12WGU8Y2|@Cu>eKIGUi9vZ*3Ry zI8$-$z9fdv%Q{6DYl!jE5(qCohOxNe{>u3B7pM*utitpbhcRJpY`PQmHa2?aGwut| zI_wV~3kq-WZf+lg0#|T%0GY|46uD4J5O#l)`1A5H{Sf7uA=f@UOs~!UB%EjlA1^am z)Xd`1XUia>>%s7XuUqU05&vi?3yQ>^QU>)on_HvaHBK0?Abs{!{E*~DtcRWJ&pElV z6aXmH^0FPfPnkjOMNFs!RS;HABtnrhwYxmKMS{;W?8~~Ocv!7g`RYd8U;Wt39$x-9n(1$m zFStw=Qqmw$u`dJQu>kMCd}&=JbFo7*HYTN%`Jp5632P@9w_2ZcKf^v{)`}Z>S#P1# zXJ_5*%Zr@)_2BU25JeQ@S~TOLz!L~1knAxUyD7L%dw-#YXg)BAup@C14)Ws9U3^7! zZ!aq#`p{5q3<(l&AI{O{0}Y#@fQMQwz$~_3QUI>?lNY5Rm?K8rc7Ab8gJcs9jM^ZX zpUPrK@T8O#N8>+vc~a9oW-_Nzo4t}KR8P_NoS$7Gy+af>Jdu+<4i47b5SpidALAEV z-QI{jKr#3@r{t^T8x-YzPaEInQJdHV++{t`emwCjN=y%Yvg-pcuEp$sYJ59z*)E}^ zs>-X7R^6=n6V7dXWwF(#vb!!Rf9Lv>*9ti}N2nCzQu~Fz?UIDaGFoMVY#zq<=yo38 zqhHI6schUu{L7psM4-SkPAyuBkfr zNdDH_Ba20&<78uiJXFq!U_Lci^~Y1?j}iYec9wT_xtEP-KMj{&(xrHvA&lIuDUOQ} zAfaA?i(8{d{PBcG>q{lQm(+Cy|C>c_$@-lt;j%=QFmk%Tk@rs5ZBuRGqx7{2R25un z8`F802+x)7lV9u^j2=fsXfPY17gyqEetQZD8S}G3Hoxqt!}R8vC*V?FagX{TwcZhx z;&0_(r*-x&tKtI21zH#d!5t1vETB&%&uTdv_KTs*hQVbyFs%y(*K2cbgOaJhhiKo= z5taX(7?VS9$7v;2X1>-|;Cg84?9?n3Hr1H`8=N5=KCYQ1FyqO0W(`4Ci8^1x_y605 zmnDVDitXbuev**>KTZ*eHL0U`WWr|ec>EztV~weR(@4IyZB@*X3|sPWp9BLTH65M( zb*xzUmVkQg1trYWTcksWi>ulQqg>X4 z2+m1`lp+qQ=FXOk3K~2w=^#-8VlDuME*?ccF$Xi+F{!&dO^#aO5*y@^)1gOyP^~8} zpNN|VKh{;+gga|`?*wN165Bcc{bvDr``vnWhU`GR+_da4HTP>P2V9ciPBn(L)GjXI zrC1h!nKmoMp7$d)w!0wJQ6~&PaGUZp!-qLT6?|_Pm*QP;m_6=-e~d2ycQ$f#aUTk} z$yNxpK1z-6VcoBT-%!V=X0V$f$ygxan)Gpn@#rB%uof3eLL~;WZ_`(VK+Iy^(BI7g zM-ZbT`1Dk=ECf>U0rUtX0wnOQ^_x^315e~Jw~Vfq{3uZE`&j8vQ*?*)8sO10`owdM z@hgX$9cdI-b9a~GvHxAzWZln6THm#)KgW zD(cltIz>Pc&b<1uadkE99W+>jgIBQxjj%bDM<&>}%jiEpYnZ-vo=dti&AY{ZTWZR} z-#V(WFk=*=wkEYt#ci(KHhH3mCt2u3|0#OSBFdP~5u9z!hL(H9h{AMplWGz+FDm)x z$Rgqx>QnvaB%zO{(lB#8o@_6r*bQH357Nn*jVA@A#*^Pt;&mE#I$hkQ5tbkv-)gXq z7x98HZzZP}m_OJ$AG?uiXa3bh_pyp6dGY5F#){w=u4a$nuF>Lavq;}|S!=Rpn881p zY0S!+5)eYZNXJxtBURs*LVc#$xP7Y$zBUolF5Ia{9ZJWy{61Ldz5*N==0UrP646f6 zekw>&A40j>@JF6Gq&?!M;u;TEcEToR`zK0b_BaXP3i*j%V3dx4-!x4LH9;XOFRcan zn(s=~_`CBNihYUNtB(UC70qA^xjvL2KPp__r}+Go^pY|6xBn(HblL_iG3JEtAx(^` zs6cSarr%mIVj@*mI<8@*)Y998ml*kaOxpKk1N7lDTYq4l0)E+E^&zb}k40P7HOI#) zrCMh|tZYb|fsjVc6QwVj&EFRUTx+%O-Cs&EfRqM4JuxjPyNxE;55ngM^UkXzzd66q zajvJBc(%(?(%Yi}{?=c}$tU&8Zuq8vDW9av475e2sNkA#D?c%M^%4k$-wzvfW`v;7 zo9Q<*t#a4%V9zM4L#y<0Kr6qwSB4*OGh1-Ai!ag5J84Q5<)prSGyW((b=HEBTzZB& z@uzYHp{yUYcPhTHavDZ875!Y-X)bHR3skF;*uXS8{#yLmAzbFbPSl9)G+*l`RHt$ATj_>I)dAa|-P?j$89+h@ zl6)wZa}XWEu4zidPDlI8a*6XddUy>_)~%>Fk$i~t78!1?%WT@;^{JEp+}9;nLZ2_3 z(iOea9#KiY4PFZ9Ki-ZX19zWo4ce^(ozde1aEOxp%T)wVrn^T@=a7$VM62$Ug2paJ zI~YIuEcR6_z76)AuQ{9{kGss+{B~5%5xhNWIKMkujvBo7xf$}evIsP0nPANcff=FCDdX@Y%KPK%OY~g!ww!?F%cH zlAN=-c!JX4wCCLY9{szQ_~OPknh-!%yXp1r4g&#moi9xB6?W#sa;Lk9{}8>0d>od| zbN%$PLz6aDb`jT2gf7hVN@BQ+XW2kopL}odKl8*|1S@^K`!lMimdfpD->|5zd6hzf z7y9Gf#Jw%L98Fv*BN2G=?2)PTHl0`bxy_QLmJ_jL9B&uVpF>)a#s3wHHU z6a&ed;{;X;w=E4NM}5J-=G=8fGr;V8a9;~wnoe?o!46wZ$N(K;OJeKDZ4#k;62@Q4 zj#!~!#zGB)snM}=63REx_3LsCaz~>wLk}o^zui@pdTmQ_yaaW!DK-EHWZ^hI3o&DD zBl7jCJgtowsblfbwTetz+&7zF2pz?gNUXl&aeP|2Q1g|FQA>H`VOT66j8MenWhA!; zHppRmHMyR&Pe~rUy5AQ9haRibc_txWlyheR9lWzLdoCV^MJEtSD(|)FnRkXdL`rDH z4GuMS*0f|dALJdqi-CwmMS|>u)+Ae}1vtZ`ZW7ptxfu-dB-Klf{mc~0|BstGlN7UI z_@>Kc$aACX165jKYCh!4(AeM4M@zes%{ok44`_RA=zuFYq8G!Cr{xiN8}vuz0DTWF zc?vHW+xXTBAil8z)865LlE_eP+f+8FWo%i`j;o?dNhoN|+`rdTrh03HyHhx55JJUa z70Do-b6mmq@1Hc**!^O^<_vGMo#2CC3KY77i}d>Ml)*%#iYW3AOG^5+3w~{uHa5BY zl@6Z%T$a_&DY)<)eLRGPP)jq2=y9@+)vkYo90l{Eh@Ts>!eznOeFdOA^!r)z=290kLaLS5Tms?>ZzL3$QCgGRZ~3b@pbRPv%% z$aYl8-{Vt!+;pFYV<+a{$9ICKqf8IpOP^0@-_2&KahuZ+1X)vqN+r?r$N;w6VJZlH=e<{nK%bfo}iK~Si4Zla2>YX35%2b_kg zhm3|kj_gphanMs+mkdWoDZoLF9|t@XaUrBBc0sMO!?RNrwkc)am^2_x>tvI+O0aRDq2 z8j)JxW|pr9GhrdN?7QeA|6`N(x_wzPuF>kg#~@~O4`KcRz)>b~<7j;Hl6r-fMXccP zFazKE0i#5hReNI5VJ1Ow6xww(sub-)c;A)Ljp)X4S5}@aY788CdpqbGor5m;;6+|t zm!NJbfdk%V4%`LV(xLMN?m%PTf?yP=JTS!WyiDZ?e$Cqn$Kwx&#cZdW*-gVQwB$N} z@K5${Nj+8bOnLdAd6)m@s=~ftV;b&ETB@a}fn8+Vh` zq6p|$$#eqL(vp2NlfNH+Gw~>TCc!_P0UDx7wF#jpbgYYH*W(J`R>I-e`kAX=!?yYj zfkmZ@nW*|uB){x&gz<#z;A7IQ#wPLh^xl2<8> zkDmCdL<5`maTtx11syN!_&tv;+bXV%@=VY>6ma$?GV9Fg@x;#LUFgK;r9ueDqAz0T zT2ZZzcGTA^O6?W9Pt)FYGhe?Kjv6U-yiZ+sbcQ^0)COAH3{onw=bxFFVKT}NX_c+Y z`v9>-|8}@7F-Rl2v<%tDzCr;A&W?;S33JjGmKI-K7|VcoeZ3oM%xM>7efpu~?8)dWelnT&KE&IEFr+^<^k7GEuBx#O_b z+~g+QiP>yk|5@Ev{9?jZ`?&`&|GRX+(fj;RU<4@IDakxv;F=+he>nZ&c3hljtoLBt z!22_b%lf0MDEOKMLFKQSjebZBkhw1qTWIH5&){^0*A8G`(Y!l}ERclnzOQ#2BnnsD>3eo8 z<1@NhWewaa7It|<)57n41I7Q}7V-Z(EbM=J|EG<0l>0t%@_*0#^JW4u7a8R^t%Q8r z6WINxBsqzCDn{IN$-TiQa91*+B7YEMrxZl0Hj$SY}^?)b9>io9TI81 zXq{1ZxPdGj!J-9Vb$7cwLJK!)`HXpdLtn4{ORP#CrPnL@=f+`Vsn}5CleR;J)W}`_ z#el`eF5-=|@5xbyvKjaQn;ycE2Q6AJa!=GGOfINXxbGq>Y!w@;MYQk8&4v=N{W!iE z(RuB1Q)jmYTP-qgqq!GyB*yyUPFJ+*b%Te_HqK=~RVhv_-%+~D!K~7BRv-Z=@^CPE z7b_{e9YTO<3Nov!rqEW3o(64dc_{l!48xt_EX{j@*mTxxH|0f~;|Jlb1SLc4y z+5Law_3ZN4{y5=TzSd<-nY~}dJhrDHX0P>sVJ}*AEfBHQcsIN?!W6DNGP{J6qrq#` zUb}XmaPNWd=>Euqn4K;jMTlWpokP8eGNaw>HX<|19`>^<^?Z2zsN!N#U?CwP;i{`C8N6`WmllTc`lZh_pCElz1T z-bhGz!~ZqpF+hzy5)yrdx{|z6!1|eme~8h?pJC@@`BfEEKPH?* z3G0~ATsKHo+D?g5X+L++CsdR_FyhkN3}w*$J9IipBL6h5ksg1Bn%a&X>~#!6rI98A z5hi=FGCHn1@|4wu{=1e)Jyhj98m_Ju#-d$N9YhTLB$o)y!T3AGov$SJtv?5HO?&qHdzRkP0npnzXmWf@j~PDXtSJ zCiGxeRlmbQa$Tt^Z6z_C5kULmPHxLrr>6Ekjv8wK5sY?Nl|*52?OsWK=II?p?ghfj z)l_tk#!dU+%rO+zypZnEPQ1i-*GeEzas7&(aw~$kwd%pqD9l5?z#0oq;%}L_G>opO zX*07j3|}T;p|cnjwEhy;+x+=`BrMzzByxKGk=+cpy0LGKzb!im+jyn4$jbFAIRUlT)=;wU z*phM@ENeO4MZy_n+RlWvy+yordfdE2A{6%+ir=*xF`KS)?xYafEEew95eG8Tafcb` zk+j_AI%s~#Zn%k{sF1suQjeQcT$MJ=TBrMs8oGZ!@JX&H-C%L8F-4qxiGBT!OA96H z@=$KK+QbZ63BiahOW&h}!xL{-8mYT-z+WN;NkhWc-CVXirDf#R=@=7nJ_=20@5Ol^VBQH#k`HnTEvSV)ZI!tiu^8i0j!g<+dqu$c#%{6~)q7 z(^pz0tW&kee@8kDadaHjpza-F10T$!7249>W|UX_Thq9aBJDcoOxi+lnXuGOj#P9~ z^>ZBgTN{(D%0zck*F?bJr%Y<II zA^%YU^^gsVo)Z;|KjP5_ksd({g(5ql=ROwq)^cLBrS#Ya)~SP4J{obAHorD-5X>{( z@8{FWwvx10Z?4y7Y`>{GI<8Q#s3L)vUX(eJCi9j(miS<^HVS9V@0Srx(d*J*4>xu) zzmv-C7wsm~Sse&N<0k+O*EY8+B)i_M&!eoZS@~s{f|erO)aAs1;;j2U_S$Ib15NC0 zt&e#)i2OGZcwyzpGVp1Vi=s^~7T2uaU{_Fxixd(jDC(hTDwVP20!x}(F?~g>=vNha zM8jNzbJ^WvE`CCs_)nxXH${-}#aI)-b;L21F>SN0JTApZ8+4Qu42kVhpKlw&l*+t+r~6l)vD%xZp)c$m{ATfZ!ag#Q3bXT3khmF*aK$A z2hy8vp8T;*?*-yx8!e zA^G31@jP0P%DW{*x6IYMl-mF-Vf!ZvF!)1C;J-#wR`eq;p&BdRq5b}Wn*~#D z+jepuN7Ql4+tkcQF#?A_c9o{eI zplM5a0kG)_`K;4RSOOicGF!p~VI^^?Jk_A6!pJY)%`=F=qVsNE;M>GeW%4pu zEzxPqb;xkO{45DRdcakdVSrdh0~tjA%~<{Z=I(_HmfS`1`i7`U{8n;WqJ@cJm|LZ*_@$>6N89FO zSq5K$leFFy_9-uq6OooX;Is2Zf6$xLb&d$Ft?Yb`OllRo8Ay%GgIej_sOMrz!ajGr z{7m{zDs@r(0H*}$-r}5}?T7kUZ`KQyY*iPwWo=IWP15(Ifez-m*CRwDOBM+U>6KC< z@vJ+xY>8L_dWFqok|rNkSwQRG(PX+2i27TXMUp>R7tHg-tA#Qy0?WQfF8Tvd_s)hD zXFjdeJkoxLM4!cDgA_qn;}9av`E&aIk6Q@CciVgXRr7@iVz07%2YsMT;(Ud(fKIbV zm74TnkVx;8jbYu8g{@vPHp6@2lYr@eDb-~;M$>m69MZk}S*$;Ve~U!hYr$Wq7xq8> z%6~cFMN8UPUV2;@d7_J9H~1O-0-8T6WxW$A`tZIdgDWEoC^Vfd&-KKTJ)XAVJV%om zd%|<7ma6pJDE~;@NLpV%lqLSLEJFO>+|l>*haSbThY~!)oI7P?L1z#xAq*?YY_8Av zqpnosfJq+%*#vSB4bFI-oRPcGUEw3heZq*nj3c&iYtfN`SXIhYe7x|QjWo1amq-9D zT&fmnE__^B$v6OGDi))0XjNU=UMc10R)CJgKI@ZC0)v|TIx^RHVannMa~R&lkEIY~ z$n3+fJ-HiOicMnmt%K|l<2#LjP($!Thai##v?5XM+7ZM`a+q+f-;Y2TZ$lqy7Vb z)m&FseTQ)M6^`rqSNX;VL1h;E_r zg~=aMxqK}}D9PtPqxw!f+-Gp&6+Nimj1MWspj9f5x9?XACBHSQKuO{wO6x!sc{c^@ z%lFP!(ozpQo{_`%3-~0iRkt%CXuG%}C{y*fI(LMCmVW9z)P-^!=4T{uH#cfN?0_8F zt;T(65n?+%m?`^Yl>p3CUwdzP$Kq!0r_lnUR|Kd2Tz0k9BMww_`1SiY=q1Q*OQ#ZM zHYD|sV0%L}>8oK?Sa@8AH#aC_8PEGh>xkgr?2O#pkD)Cf0^>R-T%vTe>Hki!C@h!zX>lj9 zD~kfj&*?^b%}AJeWxTYbQvNa^@KOGhqj5z4t1J<%_%nS8E9NBjo47(%J5j%)F8?1- zK&!n&?i_GCaUnMK_NF!sSnaqlCrEu>+PryhKQn(+2+ZKX3CiIX{x4_HCD%R~odrte zHY$5gr!*Y%+4-g14tFF?)@y}8&)y{WB=rxbfj^Rn8Dz*N3$6B+6KB~Wwm%^^1Y2SK zP)M?Uy&W=NF_8LaJLBJ5tyJv;tc+@8U&#*Z6(CW;D72KUqsnZMxU+wm*bqpo%3`4g zg+P?3t*8{fzO&n%y@a}R9P!&*ru1k>M4g{+?u&&iALyrTeny>9%NE74%125G)WK8? zFAxGSvKy?v!JHB;T@wtK%o$n>!SJPMvkGVjD6awcURH`0{zXwmf5NZL$9#7ZM|h{B zB%>GyW4hWlrkI&5U0MuX1@BK z`d3{puu|#qTT_pwRT~22Od;}}o}?{&4)4dfvLXHO>bYBPr7t~BtL-HFnyId&nQgq& zT_jrkNEuZi-~%W*A{8x3Dior;9pa&ra!WT$uS#Zg$5~=h@v@#nho^lpY=6C zAJtw$HuXVclFc_ks2cdib{{-t(siMN0w0t9-A0j5+WD(VYL=I3GYd6%TTqH3>2Biu z+EY##zgX*}ecZ}8IveOm0((WC`tV30eLa7rvVik#%_6Z!d(W+MbX+w-D+2ZLo=`(1 z_tKIXdk0JQm3e!a-_dVUeshUgbE07!aElyluqm zebl&9sgECw@j4ez4IvdrS24SiC>DZ*BZl@7BsM>?Xks+W zTHn~hhfZ&3DHs%jjt9AeXfLTQeaW-@z5!N>l_&w&&5eFz(r zDz2Z($llk?$SKmiC-eL(f&BaRM*4l~6tE!Ls=AqooWLWU;8CbWp)?b^X}lgeg5Yp$ zdwFl}=A3SB361m9gcc3V+X_lBJ5(Ux32Tl|y-T||@q{SIwzd_otfP4O+5E&c8S3xX zsta2kHx#QbRWGi(^48|UxfPEOBI_+;_yioEy9}AWc#^~cU-`S$ozwFyGIn4M0|HUI zIeJdTD$IWdYIqW6a}>95cP~O+E&Tnh_EabNlDkQ)jgKnXzG{)cHtQAPd^g6Kb~nJ` zf)H4S$I7W955M{{bF)vE*#lC-c=bf&n<+(Y5{wZRWb*(^{{tGagXPar4<%P)wkF(` zQo^cOLq&)!Ud$HLwIJ<1&&i1v3zZi{4O9oU zn1-GEVVroW#xx|LG^?^5UdiTC0$an%+5B&*^RSus8d5+JyIP5ubB;!G+R_r^W!I?x z&NAGi-ZIP5{rap!JOvSUUa!@dGJpVkn0NqqE}nIJ=)dc9Z`kCWD?!2Jd2hG}d_Tr@ z320m9mA}z5Szn}#{!zN_%HvF=CI581z5hD_ul7*uQVKjydQBZs1L;7&)YXp7e8v7*NL!a_h)lQr924~725e{N=xLv&p447I;MiXWxbtBl%S21&iT~M1O}l^Z%T$HJ z=Qz;wk8@M(&=eMA)d^Zp@S*{0?VYQxQ~(_C$s1{32M{0f${{5rD(CNQKc%Y_jbVE6 zyr`~I(Tr6<@c7;4O@1POnPxFSsmJZ^%Cn?BI#KYM{$|TXb*rY;hza&_0<@>sh1hP^ z(CoB|&!dmJQ^0$w4KEGikk&G9!onzts-><(J(g(*d8yUaDjebU&r% zIwOK(i{s%gEO)o#E}q1x$Ys4g+c2S+^_-0*-YzOF?CS8kas1BcA%hRjWlZlUvQ^6v z%f;C$SstnBm(b^VlFEy-WaIQe+CP)BBFS$*@6=n1Fwn-ckIQ-lAm3-KkzveCDGgj6 zr{~wx38twoXrU4R`JL?{wXPl%PNF`1apvf5oh#dp;~tpi)uS>65GqB$&-Q zx(M|xn*W|W&}AuZrG@=ua`_`feuEIjg`kRrF?`pD*{R4wgE<%9h@Q)8{yT&|{1d&# zit#Aw{<~b!=XnN)WP)h)CT2L6VS4z(xB_Cri&2*tV|=MG|BWy3blH-}GJ};>t=4K~ zYD|@J{AmS76u8(U4?U9d?PUmG)S|1-CC(bpu@I31uKa!0dMbRC)zJ7ZN(H+0EXw0X z(4q{dHEx%aiF*Ose`^>Jvp$R~_1IB)z4zsZtyj(QyJB;}=MG7%bB(^852OKoR%yQ* z>W9`mSq+(Ne~cGD&|#X@k$oDerkAri>U5C-q5Kt5)R|1+2<#l&R2$JNtj8X5}gbqT@M`{H7`_ODk~uW zXi(T_0#W)0lP$HYS$ZJ&JMujBZWosW#!L&OT(Gi+@-;W`=J>UxG=6uF_~$k#Ro50G zMOSxk*V9u~G%VbF9hGKz# z+gUNo4JF>CT(aVO>vO;bxVU;I)vRy<&RDI^bLUOTSR3Seg|UcMF}+`(?zJWFi$i|h znTH}i$Oh@PiK3dU2odjB+RDvoRaDbZ!0>IX0VkH!A!R|Dw___z95Ck}~5a-B0%4Y4X zj;`Faw31GFrF>QV2#Vd~IIED(2XVu1=&g|yxB{lth9ZnVpZyEq4m@s9m?8y8{l>#; z9-Ie)A*dy_(v}N@dZE4#PO*v@ucPcWkf}T&mh*y^@4FY?fc4zO$_|W$pA*4#E_amu z^T5>iE(=Ei4)TwGjlZ89_x*=Z!~d{YC|jZiUPdE@uofr2b-81`K6rl|j|xr0Saq38 zt=E!OVz+Bc8{ZBy~Wcb(A&g2XcHR-8xT+WCePM@%Q1BJnwe$h@Crs)z_@tGtd7nf|ublAWBS1Ike*UZxm0zC|f!Knr8HKy^d z)+CcXuI!A{(*TXnE+ra`tAlQv%!!vTnajq>b1nb5mjjUT|kNl0q*Cqj*A0KGA#D?jw4-6Cdod z^*@7L{?*J=`771xwZRs2zJISU;K>_T8iwXw*m4U;zvV7$kD91=eArmmUtt1wzv2Lr_u1w3+3Fr^Dm5ge=dUcbB&xYGcVw z%$P-Se_&ETvRDe2*5i{r7Nm{8NK3?EFL=H@J3qISVO<0B#XgFj zOvZON_O(*8*?3de*Qg~uj-d$_sqo<0#buZH&X~|=9klDfPcU{QYa`*^j|q!wl=j

g3apoA1U;u+5@tA!x&SeFzbG%QnrX^Jl=0 zb}}9A0qvGA<;^Ben5iXPB}c}h=xE|C*a`SxWu7Lc#X)1=<9@n6e9QfNx|1rfFG zw{hdVff{+CU+82JgP_{Ryvsryf}GPT=%?dk+G0}5h{T%&riAeLFDy>B12J#sHzscGWSUqWdvz#7Mju_hHjrw>C(~RVeMVw$meu5)XRLwV`JR@I|KU-d;8vC- zXO6K|RPW)AzkZvV;gvW^;bIZO#Zh)~;ON~wbepr#Im|0E={DOi!NAVl?tq^@r%!Oo zhbA}X$b9>2(l5?!!XCS!wgtx@wsDeYqBckdy%CkqbWXdTgQ4h3!XSU$wXF1MCi!qq zSY;)8*_CWQ8jH0HZMX?wrB6)LO%4jqT?oVh zl1iV~elm9hEEu;zeirr;d^sXBv*SH`_(Af#O4i8#e*Pr50~a>-?9${)Dx-qOYz&h2 z*K;+q;39~&uGMi7M$%!7((vyzH33O;^QVD)WNn-S+yarDH_i&nYH1JkN$j&-%*+a# zzU+xpG-{i^*{^JaHU5~Uyl=;a{rj-8hHh1Wjv4~|K1I@v4;xV-x%auW`0H$1HOZi* z--Wk$q&Zi<5hgH{6~<#>jvqcw3Y+i`8kyC0lxlkqWByk{Z`+)(*6wC*emA*c zzz_fVO=Rj27j7e3)56gf;7^4u??IOxUfK{ycB|iouPz>`gc=J>RTu9QfFAJw z(ZR&xmI94`Ye#y=|4Z2N&mUUTuYzPe_D0oR>19v%eHG>f&$o(SCI!I2>n{%ha9`o; zrXrFTX}F`KqrF4de0R5`^VwGa`F=5=-BYQtwZi7<+f)wPbmS)FPxUsfS?|j(FV7Er zZ$Fy92}+F{?CnhM8ZKS_6T%`AVxD%%)0!4SNFymg0 z)wlZu_!ov6Et-wb1?+Rehs=Vp1OJci0F2vP3S0k6R1W_){GVLN_J0*p-W%J~8!J^B zTexxsNRi-o=7yp?U+0lmJd<%lb&$OuEmvr~u{uX_U=?6o zr*rp0JKFSBsw~3qBCYRQh{M{-YqE3&Z6!qi#s1Ie4vKe)cKg$@FP}J&)RlFV8WgOf F{s-;A2Z;ax diff --git a/buildnumber.txt b/buildnumber.txt index ddc27b0c..45b1ccee 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -739 \ No newline at end of file +741 \ No newline at end of file diff --git a/source/funkin/desktop/windows/Window.hx b/source/funkin/desktop/windows/Window.hx index fffe9d1b..9e301d4c 100644 --- a/source/funkin/desktop/windows/Window.hx +++ b/source/funkin/desktop/windows/Window.hx @@ -77,7 +77,7 @@ class Window extends FlxTypedGroup { caption = new FlxUIText(24, 4, 0, content.title); captionButtons = new FlxTypedSpriteGroup(); - for(i in 0...3) { + for(i in 0...4) { var btn = new WindowCaptionButton(this, i); btn.x = (i+1) * -(DesktopMain.theme.captionButtons.size.x + DesktopMain.theme.captionButtons.margin.x); captionButtons.add(btn); diff --git a/source/funkin/desktop/windows/WindowCaptionButton.hx b/source/funkin/desktop/windows/WindowCaptionButton.hx index 1ac3627a..bc4a95d5 100644 --- a/source/funkin/desktop/windows/WindowCaptionButton.hx +++ b/source/funkin/desktop/windows/WindowCaptionButton.hx @@ -6,6 +6,8 @@ class WindowCaptionButton extends FlxSprite { public var icon:FlxSprite; public var window:Window; + public static var anims:Array = ["minimize", "maximize", "close", "restore", "help"]; + public function new(window:Window, i:Int) { // super(0, 0, "", function() { // switch(i) { @@ -18,8 +20,11 @@ class WindowCaptionButton extends FlxSprite { ID = i; loadGraphic(Paths.image(DesktopMain.theme.captionButtons.sprite), true, Std.int(DesktopMain.theme.captionButtons.size.x), Std.int(DesktopMain.theme.captionButtons.size.y)); - animation.add("button", [for(l in 0...6) i+(l*3)], 0, true); - animation.play("button"); + + for(k=>e in anims) { + animation.add(e, [for(l in 0...6) k + (l * anims.length)], 0, true); + } + animation.play(anims[ID]); // resize(18, 18); // color = (i > 0) ? 0xFF8888FF : 0xFFFF0000; @@ -40,6 +45,8 @@ class WindowCaptionButton extends FlxSprite { switch(ID) { case 0: window.close(); + case 1: + } mouseInput.cancel(); return; diff --git a/source/funkin/desktop/windows/WindowDragHitbox.hx b/source/funkin/desktop/windows/WindowDragHitbox.hx index 3dc8ee02..2a7cc09d 100644 --- a/source/funkin/desktop/windows/WindowDragHitbox.hx +++ b/source/funkin/desktop/windows/WindowDragHitbox.hx @@ -2,6 +2,7 @@ package funkin.desktop.windows; import flixel.FlxG; import flixel.FlxObject; +import flixel.math.FlxMath; import flixel.math.FlxPoint; class WindowDragHitbox extends FlxObject { @@ -34,6 +35,9 @@ class WindowDragHitbox extends FlxObject { if (!parent.moveable) return; if (dragging) { var screenPos = FlxG.mouse.getScreenPosition(FlxG.camera); + screenPos.x = FlxMath.bound(screenPos.x, 0, FlxG.camera.width); + screenPos.y = FlxMath.bound(screenPos.y, 0, FlxG.camera.height); + if (DesktopMain.instance.mouseInput.justReleased) { dragging = false; offset.put();