From 534e0f3f65e4b6c9cb72072e6fff55bb29947480 Mon Sep 17 00:00:00 2001
From: Avibah <redstoneminecraft45@gmail.com>
Date: Thu, 14 Mar 2024 00:26:39 -0500
Subject: [PATCH] fix note font sizes

---
 Editor/New SSQE/GUI/GuiGrid.cs                |   8 ++++----
 Editor/New SSQE/GUI/GuiTrack.cs               |   8 ++++----
 Editor/New SSQE/MainWindow.cs                 |   2 +-
 Editor/New SSQE/Properties/AssemblyInfo.cs    |   4 ++--
 ....GeneratedMSBuildEditorConfig.editorconfig |   4 ++++
 .../obj/Debug/net6.0/SSQE Player.assets.cache | Bin 11276 -> 12049 bytes
 ....GeneratedMSBuildEditorConfig.editorconfig |   4 ++++
 .../Release/net6.0/SSQE Player.assets.cache   | Bin 11276 -> 12049 bytes
 8 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Editor/New SSQE/GUI/GuiGrid.cs b/Editor/New SSQE/GUI/GuiGrid.cs
index 6af4a214..960b1622 100644
--- a/Editor/New SSQE/GUI/GuiGrid.cs	
+++ b/Editor/New SSQE/GUI/GuiGrid.cs	
@@ -145,11 +145,11 @@ public override void GenerateOffsets()
                 if (gridNumbers)
                 {
                     var numText = $"{i + 1:##,###}";
-                    var width = FontRenderer.GetWidth(numText, 24, "main");
-                    var height = FontRenderer.GetHeight(24, "main");
+                    var width = FontRenderer.GetWidth(numText, 28, "main");
+                    var height = FontRenderer.GetHeight(28, "main");
 
-                    color2Texts.AddRange(FontRenderer.Print((int)(noteRect.X + noteRect.Width / 2f - width / 2f), (int)(noteRect.Y + noteRect.Height / 2f - height / 2f + 3f),
-                        numText, 24, "main"));
+                    color2Texts.AddRange(FontRenderer.Print((int)(noteRect.X + noteRect.Width / 2f - width / 2f), (int)(noteRect.Y + noteRect.Height / 2f - height / 2f),
+                        numText, 28, "main"));
                     for (int j = 0; j < numText.Length; j++)
                         alphas.Add(1 - progress);
                 }
diff --git a/Editor/New SSQE/GUI/GuiTrack.cs b/Editor/New SSQE/GUI/GuiTrack.cs
index 7c066145..3291641f 100644
--- a/Editor/New SSQE/GUI/GuiTrack.cs	
+++ b/Editor/New SSQE/GUI/GuiTrack.cs	
@@ -234,8 +234,8 @@ public override void GenerateOffsets()
                     var numText = $"Note {i + 1:##,###}";
                     var msText = $"{note.Ms:##,##0}ms";
 
-                    color1Texts.AddRange(FontRenderer.Print((int)x + 3, (int)Rect.Height, numText, 16, "main"));
-                    color2Texts.AddRange(FontRenderer.Print((int)x + 3, (int)Rect.Height + 15, msText, 16, "main"));
+                    color1Texts.AddRange(FontRenderer.Print((int)x + 3, (int)Rect.Height - 2, numText, 20, "main"));
+                    color2Texts.AddRange(FontRenderer.Print((int)x + 3, (int)Rect.Height + 13, msText, 20, "main"));
 
                     lastRendered = x;
                 }
@@ -335,8 +335,8 @@ public override void GenerateOffsets()
                 var numText = $"{point.BPM:##,###.###} BPM";
                 var msText = $"{point.Ms:##,##0}ms";
 
-                color1Texts.AddRange(FontRenderer.Print((int)lineX + 3, (int)Rect.Height + 28, numText, 16, "main"));
-                color2Texts.AddRange(FontRenderer.Print((int)lineX + 3, (int)Rect.Height + 43, msText, 16, "main"));
+                color1Texts.AddRange(FontRenderer.Print((int)lineX + 3, (int)Rect.Height + 26, numText, 20, "main"));
+                color2Texts.AddRange(FontRenderer.Print((int)lineX + 3, (int)Rect.Height + 41, msText, 20, "main"));
 
                 if (hovering)
                 {
diff --git a/Editor/New SSQE/MainWindow.cs b/Editor/New SSQE/MainWindow.cs
index 8b272494..ca86dd65 100644
--- a/Editor/New SSQE/MainWindow.cs	
+++ b/Editor/New SSQE/MainWindow.cs	
@@ -163,7 +163,7 @@ public void UpdateFPS(VSyncMode mode)
         protected override void OnLoad()
         {
             GL.ClearColor(0f, 0f, 0f, 1f);
-
+            
             GL.Enable(EnableCap.Blend);
             GL.BlendFunc(BlendingFactor.SrcAlpha, BlendingFactor.OneMinusSrcAlpha);
         }
diff --git a/Editor/New SSQE/Properties/AssemblyInfo.cs b/Editor/New SSQE/Properties/AssemblyInfo.cs
index 1e35438c..78819f4e 100644
--- a/Editor/New SSQE/Properties/AssemblyInfo.cs	
+++ b/Editor/New SSQE/Properties/AssemblyInfo.cs	
@@ -13,5 +13,5 @@
 [assembly: ComVisible(false)]
 
 [assembly: Guid("9a405608-105f-473a-8f17-9d8c05f82b19")]
-[assembly: AssemblyVersion("2.1.5.0")]
-[assembly: AssemblyFileVersion("2.1.5.0")]
+[assembly: AssemblyVersion("2.1.5.1")]
+[assembly: AssemblyFileVersion("2.1.5.1")]
diff --git a/Map Player/SSQE Player/obj/Debug/net6.0/SSQE Player.GeneratedMSBuildEditorConfig.editorconfig b/Map Player/SSQE Player/obj/Debug/net6.0/SSQE Player.GeneratedMSBuildEditorConfig.editorconfig
index 263923e9..c2eaf61b 100644
--- a/Map Player/SSQE Player/obj/Debug/net6.0/SSQE Player.GeneratedMSBuildEditorConfig.editorconfig	
+++ b/Map Player/SSQE Player/obj/Debug/net6.0/SSQE Player.GeneratedMSBuildEditorConfig.editorconfig	
@@ -1,4 +1,8 @@
 is_global = true
+build_property.EnableAotAnalyzer = 
+build_property.EnableSingleFileAnalyzer = 
+build_property.EnableTrimAnalyzer = 
+build_property.IncludeAllContentForSelfExtract = 
 build_property.TargetFramework = net6.0
 build_property.TargetPlatformMinVersion = 
 build_property.UsingMicrosoftNETSdkWeb = 
diff --git a/Map Player/SSQE Player/obj/Debug/net6.0/SSQE Player.assets.cache b/Map Player/SSQE Player/obj/Debug/net6.0/SSQE Player.assets.cache
index 092772a1a6b1422d3e443f464bafb5c802838772..b2318d454467781408c34efba6dca268d50d1c98 100644
GIT binary patch
literal 12049
zcmd5?&2rn;6;>KqKXq(bmJ_S8<IqWM$F2m5qAk%*(pHr$S+OiBqGUA<+7u!n5he(*
z04Rx_X}4`>+Fc)@t1dH>nZ83e-E`As`wo4Aeh0W0JOn|3N=e0>IV5p#?mgfAJwNwu
zJzrgXYhYkN`Rlgxm#;qh_wQbO{l^>AA52Y;{QaL_9Q>#7w>$s6|MXvDfBwe@0|VcI
z+;5kjsJouwdg|t}ZMdpp*AER}t!br-c4&BN)hxM==N$NoZTO05S*Bf4G+VP8zotS9
z%B+%`ot?=kbNRVkPRXgwce>-Fj9T*4we@u>w&du>ig~i-I!C5%xQcFB1c5$pfaw35
zpx>M$q;1Eu8up@SPbWkGHE;>Emx9cx8Ma?hN=~&__YL(CI%jsK<{C;twak4Ly#bcG
z38|gu=#4;%bW*G7GYFzyxBwag4TC=GR;Qb;5J;G|5!BALjpF(9?zA1cTCHqiWKVD6
zsu1H^zZ=tf5zoc$w3;@$HAUqb$#8wN7<emb9KY;NUsdzV2ENi8`l2bxbzhF@9>eo)
zce-gRX;w;OX(lbMbB$MG8prW$cBk>!v~>qxhcthyj-8@=FA~Q@hB!xYHHKmW&y};H
z&<(HRJGHK1EQj(O$F&%axAFX^H_i$~PIfF|S92Q&u2waU9k<doGPw-a!wObp1sv)-
zF{sz^{452jS1~oOthqIHPAL?y_liws9-B-N?~3$}E148ZzK37hU#385Yr*sPeYbA-
zjhYea!d5@8<mRL@&(~~SbM-k=>hJGBb_cR;x^D>GH-+wZ@td~py@ux-Rpph3+4xXd
zXtuCLX(;q5gm_zT34QMgeHr}zA#Lo1Lbq=FX4MEba?^sHGu$JyWOz#5_Ot`B&#JC*
zKwEkfOHM6@ShhuZ+Ty8vQI_8g%5#{v1<dyaOqk{1L)&Cu%uP+-r|pnF+}!lo%rGt7
z%=F2;Fm2qtq)jhjuDdrYOb<6JX-i1x`DW&X>E!054`zgE;%4NW%m>rX&BwW!4W^%)
zjn~OsFo@h-^u|oE%DI^ccZ%?v%=oPrQ9!WqbVm`My>y^G5}ZmD+0nd8@Op^6mYwG$
zc{%(mU14Hfj99Kg&tu|Q+EC)XC3u0aM~th2!Q3!nUlMHkSzPCWuA!TruN+zj$Hcxa
z1mivpy_;-%CmaoWdB5$Y#2L5sBt04#WqP_9Jt-UTF^`Nz&x18ls#<BYc$xrE=I2P@
zO5ENO^P;dpWDn{2Zg)0`M9C$XO&q*ve6wu<AH^!)2T=rf2Sl;VUC=$yhoJkQ2cRE-
zrV}d<W=7|Vr%~{<if8a%On@v4M<gyq6sPATTv_n1L_?7cJt^u5Y80&m(oGIiQsG(f
zb08Xy$@pkwg{LHukOxGSkq4AiSswgxHhS5><&mYypP|y^&m@(82tFD1_fnijhzzW*
zJW&ya!?CSqR^Xs`nLBfZlfwL+xyNcWM46YSSJ$je(XZ>Kqmn~s=;}s&)$q4Oc7W=l
z_^mIF%1JfK4)oDcVOqGO(sS2=={Yyof$8kC>%cU93$6px{;jwUO#kcZIxvX6cO6*e
z+;vD>L*7}VJEn(6cdtuS$Kdg(jyB1DCJ)J0(T8u6#G~ZlBhWl(0aO4z20a1wINC!}
zQKI0RDDfz%n1tdZ@cR@EGBi9IBs65KlF)n%e%f?(;6)<2+kLdiaPTdkaL{~6!tn|C
zeT^m=CT<c46D22;F#QnxK17=g2{##pgp!s?NPYzVIYpxk9XBb2ZlVLaAA^5x(JI5o
zO%CCEy92&O@L#8BmNkK!Bx(XBKa(cFPr&a@w9AxplSRrYDVn5w3H-FR`Tr(MNk4s(
zlBG$QmLZ$AZ=Ko9vcBPFmat_&NjRQ@|NEXMS4Aqj<hX`bs|CsBu5+uh7r7NC-bx4b
ztKgHJDy4)@!UC}5ftpwHN<qobsv>3VAuVp#Pi9W$AF6f`)l;6F@(haSKsHbIkv`8r
z6t1m-2-~M1>RHN*aBEFzix;2`&?aaLr1t`+<DJZCZnYg}UeO!C+zIGs0FVT98+-yv
zsS5(S1KRHu(1h+xfw>FyNibi6PcZjD1oNjLwHGjPa>hrUh8z$rt5ZLI4#i0Te+E7Q
z`~pM(Rid5&EX>PknF{ddP@Dwt7vK}XFF^$Gm!LGO?8%cVC0rC*l<IOkd3Y7AAk0h&
z67w)h&9qKS4O(ga$fK-%{7*t#0-w<8AVO<^swv&s0WC&2Ki7tq#y!4{80O{#IDlr3
z_z=%Yh|Ay;ViQD&UxCv6iZdf_T~J-&tpG<7UJLyAgzY`v=EQBC6P^3F+5xXE@bdW!
zR*=AKh|Cu9VGB{G;D07e3uelim(em6+c~x~W%IC{@r)zGHT_2BsBYo<jJ9uDc$&_X
zeZS^C$z~5tzg*v^gT$<+ADN!xnueEMeO6qYd9_fk&6EqTPG%m}YA($T2UG+73Pc%2
z7j&5?+}8Az^!o&teu;xi)3L|fQns<Q`$d*Dy|jg!3~RRNhIi4|+3?m%R%E*ANE3Hk
zXlLW8`l%$z@VZGngMX`CR3^=-)|TY{jdt1Sf=5Eq|8~1LI})JUTaN^8w#!p9!z&e?
z4h8PE7eYo}T%Bm%h3I&0aPPG8>=HxwXA6bXYLtDuo^bh~c_1+qPVh-l6K)V>qxnz$
z)^^k|ERx%@HO*6SluWn=z>g&^1c~kUg|3#8p^qoe^1D2{xDZU>PjDVjleJl2F5BJN
z2Q_eT1GhSc#gds=^VX_0%Pg6`)mSzTOxw^etZ0^JjBFd8V;vd#AYF7Aq}8&SVoj>i
zff>Mcaf9xZ<Fn`AM3qkmZ|xWL#4%hhrOMFf<yT#@DJ3FXBuwSlvZ)=~j)!Yh>)0)=
z;XTc@am{EUt)31SPiE7~#nXzT!ND3`N*NYD#^{n$YpgpZ%^IY;EmyJXe3LvA$1c|Q
zX;9_n!nQlPk1Zi2p&2tFc0{?rf@LCj(I)kdV8phealxjaaJRW3I7wT{&9--Jo0w^P
zDFG#|_)9IT`dZRT9b-pO)TWQcI&FqxXINGbx?h2^%UO6eBEzc>rE{2#!mDiPNrJ({
ztD%q^$)|;5*IS2v*>sJP@3@UAsj$6*@$K+-&zg>Wpm|^#?q~$+zAToF!mBt=5w}E=
zY9z^=-XLHUl1(UWlA{slUW;OQcOBG5a)H`bFOVypl=a2shDjyL-IfAba)6n_D6WVk
zR3RbT7fCdg#3Y8rb5upBq%bdA6;%;Qgi4xTVk8k$(v%356y{Gohrb&&6YZATG3D4Y
zqF^}^qwbRJY!|yGYvW>XqDUtUdlYg!kfnlN2x5(7B$gG42HkOLSkjzU)Y&bfqY)=s
sNAXc^ZJT99g7LxbC>S5oj)L)#jSF6G+84TDKD4o$dpw&TDGJa0fBw$P^8f$<

literal 11276
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
O*qMDilOHe2i1q(^1nCR_

diff --git a/Map Player/SSQE Player/obj/Release/net6.0/SSQE Player.GeneratedMSBuildEditorConfig.editorconfig b/Map Player/SSQE Player/obj/Release/net6.0/SSQE Player.GeneratedMSBuildEditorConfig.editorconfig
index 263923e9..c2eaf61b 100644
--- a/Map Player/SSQE Player/obj/Release/net6.0/SSQE Player.GeneratedMSBuildEditorConfig.editorconfig	
+++ b/Map Player/SSQE Player/obj/Release/net6.0/SSQE Player.GeneratedMSBuildEditorConfig.editorconfig	
@@ -1,4 +1,8 @@
 is_global = true
+build_property.EnableAotAnalyzer = 
+build_property.EnableSingleFileAnalyzer = 
+build_property.EnableTrimAnalyzer = 
+build_property.IncludeAllContentForSelfExtract = 
 build_property.TargetFramework = net6.0
 build_property.TargetPlatformMinVersion = 
 build_property.UsingMicrosoftNETSdkWeb = 
diff --git a/Map Player/SSQE Player/obj/Release/net6.0/SSQE Player.assets.cache b/Map Player/SSQE Player/obj/Release/net6.0/SSQE Player.assets.cache
index e927273e55137762d0915cd804d5c50153f40807..6b8e673614bb821d5229cdea28a8a711c44d9f79 100644
GIT binary patch
literal 12049
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

literal 11276
zcmd5?PjlPG6;~Qrvf}u^6Dzh8(`jwTZUji8Ezxe$RFNuKu`Da5WHl|46eLz8ED+!T
zpd@~S_RxE$=Vm6S<O}pmBr`en+<VSB_4kNf@DT(BswEY3=84+JxBGs(c)Rb<V&n13
z!s{a=BVSiOzq<L4|J45d{q=8u`09;s-n#ebyMN|?S}puIviJ8pU;pdd8xWG8)A-(A
zd}wS1!Viq6`>yZ}&23afXw=Q}u2~U*;njs3?rLSPR&RvDxUWrX(^GX{Xa&QuONJ{#
zu#BgW+I*}nMpByPIIl__ui*O^AZm|-PJlk`SErw?5J;G|F^tZ&jidcpf7&X(S+CmV
zAY+OvQjBXonb10ccCkOLwu@!WP`OGnT;FR6eW%d=vOj$_Gpq{y$)4zwwj|e0HpW+&
zY-p=L-DFCplQCJcq=hxE@k~PFS+wo`H16B3<>60-?6>B*8M?P)aTqehIf`=$6z9?2
zJt_)I1iPVE?;FNaB+qeNNZ`1L_TOGPDiCGt*uuW)H+OuqCiXplw{K)>8>~eGEUN)H
z)JqAdZ=n4s18J~pn?cp|>&C2BC}=b4keS0FQ^apY`i(1jQ!2TPZ#rKlL0Nkt2uq>g
z5Mi?}B3(1u?3^|;tCR(y=~||5&63ivv<cZw$ad*|OX|KNbzjAI*1iv#K`3h4ivZSm
zPn&PgutRAi^a+IcT(3!eZ%cje;QOyx&t59@8*XUVMC%~89h~>V-?Pgi&>C)F?#Of2
z@Wl=t>1`}CMlr(jO!lWEp86M6|E*Sk4)eN%nUgS;$Dw0uDDI|imFP&K4|g{Mb~8*1
zcQZqBFH9SEFIna#-F5$Nh3VmLC2I>wJ^!0KVLG`x8G;*Onz$P|CilU#bN6v<ZiDIP
zZsTQg7YrhI7lUyVY;f)-qLU)}OKyCOVvfzn#5fcEs{&bKor+n$p!QkWRvwUeuS;Gl
zQX|F%$zVYgu}@1jeJ!kUL0?#Q5NZ`?XP?-YrC>55q2DIEev@GW{dlMAM};%#sY!Yw
zcB$057Pqu@M2LH0Aqe0Lw3=CdT0BeuDD$%<a4zXBiFrzT5b|c!zSW;cAyIPZaw&C|
zc~B1VF6ft_Ux6sMxCy!ix(#{{bO&@7bS|Eh9z_&%c2j4v2<l9MLt5uwga1Bg3N)FV
zmo6g)g@hsj8jK==w81p+&$D&VTdrUACcjR-$*-sN*1;zScReF`g2>3q@<U_8_YmOK
za?5bkLGI>k;h->gbM}Gp#4h_@;O&ID=XTIAom??&Shi<SU?VJJy|E&~4Vn1SSd>=`
z#bF=RoMUj<Obd6|19zcJ&#}2srgO+Hlxg}ITqx82v$#;E|7CTd4C3HjC>xx+(5yWa
z95u^fdU%%evSc?59?x#*kQ`<ajgBq)@T_JOZE_sbpcxQ3-aP0Y=ssw`Sr3Y93I#tz
z2?Z6`(ooESKcuXPq2XB(p`oH%8k%|Vv&_{)Jcc4?|5+2m!H;~xK~6IbM*;kyW>pLm
zcL{`vY%~qi1Mr8CbulE|We^f7-lZXV2>vl;WenXpXr(|z6{jg1NJIA<@Q*EPWB9ns
zq1B^eUmCs-z<-&tIyMFFl4uH41WcR4hu{w;>to8f%Od4e986RGTkx~?=KotXRHtZK
z(J&3uN5GVIZXMapvbEuEmez)fiD@`~2mW6MT4a>>MrF?zX1(4jvi4nLRIA9nFri=Q
zf&OFg$upEQQYYyFSQ>8RwY*l)^3#SaodzfmyN!dXgSmT#+scorUQ8Lg7I=`&lSiV@
zB8X0vB@kizJ&0Cz8N|Ky3fhlAtDsLnRDrMtfzt~PrcA%qjWe%VO<?W?lqwQwK%an5
zK-WP8^eLz`D4;3JnE`VH>eFC;3O>Pn1|pbLvoHn$6E{fwsna6|M91m1j+;=N25<{}
z0{9$60JlMd16Y_-W|;}_4^W&2@H6lU;2%K*@K2yDuN<fw8!g%tW?VG#0(FTK?;u#F
z0tq{eOEaBjX+SIOAF9mI{`nk~hV~2a3GJ64Li=Y>E#rCjK#M1wpY1|R&po-180NMC
zn9$4-m(Wf_Tn3*ITOdL#Kv{9ckr8)psJ`&-07n|$3iwHb9X#H);da_Y@Aa+rz-vpq
z+<w7o<xfpn*+M;RK3)|3pNq<ZxvClD%-pW)?Yp_EU8&{*u_t^xZ07bF4&IC~OSXg7
z`?+cu)`N$-Ua`Y!qeK^Kx@qm%f#=&I&{rN67p7j!SL;*N!i$5c`}Mj{mhl3#3vxhI
zQLKT^@PgZ_m8d;m<i9@0g`MrWr&tm6^ad{IS6w-)x3P43^fHDnOTctfhgUY}pyD;`
zD`}F^TNKIC_B-98s+vrrc2vEucFV@^Eu>V#Z*+^ZS~-p0Su4NREl<;o-W2FnEx*;>
z38iZJMnL<Dzh^=H_F?_m-F*K=_rhT#s<mB9xl?af>c=8`os=WtVqA~SnbxhV20t!q
z)oM2F%U$$Lx!vaV`V*}>^}AA6N6#o^Q&-e|7WGfG4ERG_Gn28l$D7gnyA+@aj;`Zn
z1$k#PE;q)-)nK(&ckHqqI?W}qW4ppSv1~elIQdKjp0g*cQM$$-rA;%F;Ul70kiQC{
zXY`2AXz4=EF4<<q^#Z(RvxZZ|8Q(U27q6krXN}Y2#f0gse#vs%MC<B?URoHJzIS5L
zt2fuYvgwS{yAKy&zM)MX+jEPJ5-p3`rR>~L2f`vkbz1t1@@P?(+Ojvvi+B5*l9AZY
z=OvrIqHTLsa?<wXwXWaTew*t0Q2|QZI;T6f$E7rrKg+IWXigtUgKwuON3hSk{hP8{
za+Y?SRB6Y1DrnN<v_p>~EHHT5F&1%S`K&bMa_6I8vVBnwJ->NHDeNBL{Ilrok5vnG
zGJD4s{zMGwj_RhzX-5*LjOSxXBbH>rU@MW5l5Hqmk`poKc86j_Jw4RMaxJx;(GgcV
zsm4pnjgw0ByP*Vh3JjUTINpvW3@M@J7fZC2BqYXVJ02oZQkYY-iie0LA|>tUDV9hm
zX-h;(3Ui0v^xlf6iFqsSFgdo3D2a^4Xt~rpyTvZ4(YV;F=+X<rHihDMRj<}6v|{jd
zB#sk{wwB}2aJ_9-wAdY@6EP>=N6Dw$IXB0N1(OfEr(p7t_7qG$*`(l^wtrdlEHSpe
OHS=IPf3hee*8c(!2<qnm