From a8ff6f51a621d6e751eb4e4b4107fead7582d653 Mon Sep 17 00:00:00 2001 From: KamFretoZ <14798312+kamfretoz@users.noreply.github.com> Date: Mon, 4 Mar 2024 06:10:55 +0700 Subject: [PATCH] OSD: Fix Recording Icon --- 3rdparty/include/IconsPromptFont.h | 1 + 3rdparty/promptfont/promptfont.sfd | 25 +++++++++++++++++++++---- bin/resources/fonts/promptfont.otf | Bin 245496 -> 245668 bytes pcsx2/ImGui/ImGuiManager.cpp | 4 ++-- pcsx2/ImGui/ImGuiOverlays.cpp | 4 ++-- 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/3rdparty/include/IconsPromptFont.h b/3rdparty/include/IconsPromptFont.h index 16bccf365f6b8e..706ba748ddd252 100644 --- a/3rdparty/include/IconsPromptFont.h +++ b/3rdparty/include/IconsPromptFont.h @@ -343,6 +343,7 @@ #define ICON_PF_POPN_RED "\xE2\x8B\x88" #define ICON_PF_SLOW_MOTION "\xE2\x8D\xBA" #define ICON_PF_CONTROLLER_VIBRATION "\xE2\x88\x9A" +#define ICON_PF_CIRCLE "\xE2\x8D\x89" #define ICON_PF_USB "\xE2\x8D\x9A" #define ICON_PF_MICROCHIP_ALT "\xE2\x8D\x9D" #define ICON_PF_MICROCHIP "\xE2\x8D\x9E" diff --git a/3rdparty/promptfont/promptfont.sfd b/3rdparty/promptfont/promptfont.sfd index 4fd3b1be4e84ae..d2b431e4c8660f 100644 --- a/3rdparty/promptfont/promptfont.sfd +++ b/3rdparty/promptfont/promptfont.sfd @@ -23,7 +23,7 @@ OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 0 CreationTime: 1544355305 -ModificationTime: 1708442685 +ModificationTime: 1709506515 PfmFamily: 33 TTFWeight: 400 TTFWidth: 5 @@ -65,7 +65,7 @@ NameList: AGL For New Fonts DisplaySize: -48 AntiAlias: 1 FitToEm: 0 -WinInfo: 8778 38 14 +WinInfo: 8816 38 14 BeginPrivate: 8 BlueValues 29 [0 0 380 380 490 490 660 660] OtherBlues 39 [-210 -210 -180 -180 -160 -160 280 280] @@ -77,7 +77,7 @@ StemSnapV 13 [140 180 200] ForceBold 4 true EndPrivate TeXData: 1 0 0 335544 167772 111848 513802 1048576 111848 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 1114112 730 +BeginChars: 1114112 731 StartChar: exclam Encoding: 33 33 0 @@ -35163,7 +35163,7 @@ SplineSet 271.154296875 368.845703125 278.845703125 347.692382812 296.154296875 347.692382812 c 2 934.615234375 347.692382812 l 2 EndSplineSet -Validated: 524321 +Validated: 33 EndChar StartChar: uni235B @@ -35250,6 +35250,23 @@ SplineSet 684.724609375 425.833984375 l 1 684.724609375 600.990234375 l 2x84 EndSplineSet +Validated: 1 +EndChar + +StartChar: uni2349 +Encoding: 9033 9033 730 +Width: 1000 +HStem: -168.333 916.666<363.706 636.294> +VStem: 41.667 916.666<153.706 426.294> +LayerCount: 2 +Fore +SplineSet +41.6669921875 290 m 0 + 41.6669921875 543.130859375 246.869140625 748.333007812 500 748.333007812 c 0 + 753.130859375 748.333007812 958.333007812 543.130859375 958.333007812 290 c 0 + 958.333007812 36.869140625 753.130859375 -168.333007812 500 -168.333007812 c 0 + 246.869140625 -168.333007812 41.6669921875 36.869140625 41.6669921875 290 c 0 +EndSplineSet Validated: 524289 EndChar EndChars diff --git a/bin/resources/fonts/promptfont.otf b/bin/resources/fonts/promptfont.otf index 49557871d93e6079cc7571f234e57dd81e3eee76..9a473a13833388e9e9ba5be67f764e095335a9db 100644 GIT binary patch delta 2795 zcmY+G3sh9q8pr?NcV=J$=ZIisiUN_4VwqxAJ`zPyuNvm#Qi;k#0Z~9j5rrIlP%0D( zh>tSUGEvjaQPAWndb6$x`9gf~&@4>yg$km)PTv_^t98#>zy15~Z|}4B*=J_Wn#axR z*P3bxoG>8}j!1!m*Zczl-20VhCIRLeDBJr71WXvSF>hZPlmjCGxDFpWECA1z4g-fsKMH;@;^nLeV^12Hm2I3M zZIdzb{lk^JDmPR{RgSCdRcTkLR8&{|ToG0gS{__Jq`W&&R$F$b?0Q*Q*%aW)UEpGj ztfgQ29{*gykc0f+6_Rz#@s+G9y8*9EZ>@6#Cp=9HIE9xy%}aS1FV{1t@<;q})>!+O z4ZI1+O1AIg%m>j%A2Zlm2@|b__Wj8suhvswgZKj>QnFFJNJx?FBHkw)klayRB%G7n zMJykIXT9XE@=16KgCuto`wPP)2Z%$2S(0Usmoi%6e~ascX28Nh60}zIx9cUF>u{*p zy%i19KuT;-YZqIyk)O7t*}16p%tD7cs~z|-hk&z zXM8LAtM!(L(%}W-Re~(QvaolJa9^@4?ky+qu9v)2+#obbmJNM6wZbcaYY_CW&PqUY z5?+v;EtWYt{Dnn=hoGNqGw9)V8{k9YJR9I2#I-iShe5S&HoyhqWj4V75$j`zWt}79 zR=`IkSJ(g-itpP19~0LL7X1XrL3Jh@;Qxw!Y=D0h&$0nNAx;z)%KV?iNy3Mc|0mui zIVz~Mc8i${|wW5VA>5#k48i?BJUw;HKMCA^Au+7Mob1`QxRvt zY-h~=33H}m&I!c7iTEEd?;_^cBcTWjwjeP93r8VoI~Eth5)4Z-Qa-{GGnQmv$vrH+ zi)AaZazD}sS&%UotHY2z8Ed;^Z4PoKAg2&H%~cnP z;Aj+1Jwfqc{CXN^R>E@D2j||w`K>6)#f1?lzk;jbxZV!et@!;U{fi9!H@Nj2Zoh>)fvA~-hp(gFfcm|79D*lp@Z=C0;?ejj8gHX%H=1M7(i<(s zMB_*)CA&m2)ska2wHZUIE2)+Wa{8H^hmiA0a&ae@2y!_^&w7$;J#~&Gw>IP!OdhG^ zokKpETXVRNlG%%3-2GS6XMn0g?b7^cSy}Oad*VBYXn&?A888m4k&2XdG^%Pr0 zarrdwA|-UA1=W;znihUZNv@PsM9DFfve81zkI{;|^oc92-bdLPv_671+^08zFafEhtr@gG4&vG!CQYe^E;nXO%)$%iw*kLd`-eL0rZu>bqjp258*yRpCKaM+& zV%KtZYi9Qlc0bP^Id9#F?`zs!RQ z*l#iqIl=xz*#9UG?aM>0Jj|H`f_V659$CVp?fIQ=d2Aey+sczV@#GOaWfh0E<*-jU z+>ax_Z}UTEez=w&cjd-t1qq7rjN%xrv{|k=H7V`eTf=)=Kd{rF z)D)Vm9ag1rTRo?kH1y>Z4P$R*d8}%0J)WL%)S_uYI}0@>duIx1==L-!wpgF{tfq0L z+)(UWsA;{6{4_LsNY~crHQT^Hwbm)N$@*=!du_GWMrvKu#&;8(HLSYmpyBAvM_Ml} zHq}i-xLJ0OR{qdXSusb`raGoRt)<3n*048ry{64|s*+k8&R;W{`UKfs)({_-k$>td z`rPpu_{yWPub(M@)_2sH)d@-$dEmyPlr;HYK!qB0&w$nvqxq$!ty}ERGdpQbzsb`Z zd}V^BwfJc*7v?~tOcbW2wA9R77ziA3&PE#giqQOtonw=!Ij48~2ZZ!8M rdy}S>+=Sudh%uZWF-GYUxh{3T;%m_V73LT0S6ocgEx)Kh>A`;k`|5r| delta 2650 zcmYM03s}v08pprydoG$f=O5+LEOV4DuKTdfVBAKFa*Z(}PqU~{ks@7bb!y}?vJA&% zS>v)BVyva4j7u!78Pgyp4P9K9Tv`mtoaDdn|Kxe*|2&`H=llL{=lp)psdI8w<#n@S zoe&Z-0WQdd4t<6P1$oZT+0hm-S3|dFPf$=u@YX%4fzTb<382%+5rIKyhqh8@YxRUl zz5P313;i!Zo>GU;jEh+CxBP*R07EapX-&-Rh*_3hQ3Wz~Lg*JG9Zq(mR=*T{V&anA z)BG2#T`U{Q1n0qV5ors!YTbI@?%I4$khFql7k$JG*TD^N(bY*0e)c~&NAqoa(#dtV z`nMVmdOWR@2dZ9FJ*m1~b)#w;aHAfmoTt6EJlgKRJz-m_Xpcs3`$ODSyS%y&79zu=`>=4@WZ%Xy`3N~>-R*v!8DTEnD` z=(R?BLJGcXHHfTXfOoVkkbdvQLZ)OlalTL}`F(Mja7FS5V!3YbM#(;M>)ygp$=$?q zb3TER1)p$1j>ek$hgfTga1qLA+l$Ao-&BpaXEZ_>cqe z74Z?FQ080}%i#oY1t_TDt`v8rxF&w+09*-rC7TN1pT*xf0ACl&W&-#Ij4ape_~Rj4 zxyvU7im91~bcWrN>|Si|qI>P3A7j#0ne~_T~ zfUd8*8#@(@Qab4jQ(UIGMB3)G*&V#ce88M&*W%zckww zC`QGkxG5frMe$L3D1DTE%3x)fGD;b*geYN3xDutzQx+=8%5kMsxl}OCt=OrcQ^y}& zSpLJ*`z_X6uV987!kZDX29cu>c^xxtnB{|6wU`}=s3b%`K+HNF*Y?|^K)!%hi#{@qZ@WcU}r6MjYV!E zc9&xB3FMiOmyNtq>@#9tF!rs&H#70iY#i=|!)3@%LVgX7OhjQlj;=-V6MVY}$M4}( zYm|iJhv)cl04|=#TT7SGVG)ou~*v^%dOw9CzNsoo{gW4DOZV{$$+$9uJP9 zt_L25;Nf*V+K$Hxp8NszBk^nwUi==f-k>oLuczWyJ$^k5dn}s#&~y)PcB458Z+qZv zDbX0xT_ocIa(Y58tH~5dN?TH_71X+f+y;`{8FKd^_vz$*mfCfsPEX0Qfh_mP%S>G@ z)bn@Lb1wP6ppQG!;7S@=O2byr=*2YFP7@x|#4a?+N+C-rq<}&@P*@Gc?4@{5ijSlD zLn&znB_F2L1WF5~Mcrs|E~ST1dIM!zC_B(fD;Lu0o%B^d+Tc!`AJLX%+O~$aJJGH% z`g=0vo~M1oX#YVvG@kOysOTykPok21I=7t8x1|dfD$ApbrBuF(eoCT>{d8>-Rqmvl zNp!Q3>W0vxPpSSaJ#9x%tLV8uy&!too*HtgaWB1|N%rr_`sO0NokOa8MPxARSZ88g zBI_QrK85wS*szd|Zfs29R)O5=F*~KP(@lP_lwA_oJb+z2*|nV8B(Qq|x4+2mpXW|f zxpNA4zRsTG*z*VW8pB?d++`Mb$>4syxnDgGc)|n2d0-_E3gJNoJlGn~Lw51dzC83A z5Br3N9p~X6^YDN1h+aG*hXXJ3NDm$z%wscoyf06vcOdbyvSnZ zMHRd_h|`@py@vlhotNC?3_E99IBP2}_2%pnUOttV*YS!AyfTHqe8xE@&MD{BvAlL1 z+p5^sz?(+%)?D6}!(YGRUH$nVpYfhwcz*^TjN!sqF6zt2y!b?CE@|YmkGbq2SM=uU zRK69=cbBkt-DrMP#J}Y53xylEv;8isPj!aTI_JAOmu6k-WS#q83YPUQ2xF6P!6&P7 zSo5XT2TB5(CZ@QlSXBuXB@dyh@yjI5G)psAFHLPtrmD_x$$ZzhEKbs)cf1OqAjh)V za|FkBfc`^mP*vXssBbG0pwfDr&ao8j8NsejtujCalcTextSizeA(standard_font->FontSize, std::numeric_limits::max(), -1.0f, ICON, nullptr, nullptr);