From 031be368e4c828b6fd1dc0753a06c3e6bd3af3c3 Mon Sep 17 00:00:00 2001 From: Sunny Date: Mon, 6 Jan 2025 21:54:57 +0800 Subject: [PATCH] =?UTF-8?q?*=20UFontAwesomeV6:=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=B8=BAFont=20Awesome=20version:=206.7.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SunnyUI.Demo/SunnyUI.Demo.csproj | 8 ++++---- SunnyUI.Demo/packages.config | 4 ++-- SunnyUI/Font/UFontAwesomeV6.cs | 11 ++++++----- SunnyUI/Font/UFontImages.cs | 11 ++++++----- SunnyUI/Font/fa-brands-400.ttf | Bin 210736 -> 210792 bytes SunnyUI/Font/fa-regular-400.ttf | Bin 68064 -> 68064 bytes SunnyUI/Font/fa-solid-900.ttf | Bin 426112 -> 426112 bytes 7 files changed, 18 insertions(+), 16 deletions(-) diff --git a/SunnyUI.Demo/SunnyUI.Demo.csproj b/SunnyUI.Demo/SunnyUI.Demo.csproj index 75965300..413f0379 100644 --- a/SunnyUI.Demo/SunnyUI.Demo.csproj +++ b/SunnyUI.Demo/SunnyUI.Demo.csproj @@ -44,14 +44,14 @@ ..\packages\SunnyUI.3.8.1\lib\net472\SunnyUI.dll - - ..\packages\SunnyUI.COM.6.5.0\lib\net472\SunnyUI.COM.dll + + ..\packages\SunnyUI.COM.6.6.0\lib\net472\SunnyUI.COM.dll ..\packages\SunnyUI.Common.3.8.1\lib\net472\SunnyUI.Common.dll - - ..\packages\SunnyUI.FrameDecoder.7.2.1\lib\net472\SunnyUI.FrameDecoder.dll + + ..\packages\SunnyUI.FrameDecoder.7.3.0\lib\net472\SunnyUI.FrameDecoder.dll ..\packages\SunnyUI.Serialization.6.5.2\lib\net472\SunnyUI.Serialization.dll diff --git a/SunnyUI.Demo/packages.config b/SunnyUI.Demo/packages.config index 71dfeb06..3e54b4d9 100644 --- a/SunnyUI.Demo/packages.config +++ b/SunnyUI.Demo/packages.config @@ -1,9 +1,9 @@  - + - + diff --git a/SunnyUI/Font/UFontAwesomeV6.cs b/SunnyUI/Font/UFontAwesomeV6.cs index 1a8a61f4..1c127780 100644 --- a/SunnyUI/Font/UFontAwesomeV6.cs +++ b/SunnyUI/Font/UFontAwesomeV6.cs @@ -12,8 +12,8 @@ * 如果您使用此代码，请保留此说明。 ****************************************************************************** * 文件名称: UFontAwesomeV6.cs - * 文件说明: 字体图片定义类：FontAweSome，V6.7.1 - * 当前版本: V3.8.0 + * 文件说明: 字体图片定义类：FontAweSome，V6.7.2 + * 当前版本: V3.8.1 * 创建日期: 2023-04-23 * * 2023-04-23: V3.3.5 增加文件说明 @@ -21,6 +21,7 @@ * 2024-06-27: V3.6.7 减小文件大小 * 2024-07-21: V3.6.8 更新为Font Awesome version: 6.6.0 * 2024-11-27: V3.8.0 更新为Font Awesome version: 6.7.1 + * 2025-01-06: V3.8.1 更新为Font Awesome version: 6.7.2 ******************************************************************************/ /****************************************************************************** @@ -62,7 +63,7 @@ learn about Font Awesome. namespace Sunny.UI; /// -///Font Awesome version: 6.7.1 +///Font Awesome version: 6.7.2 ///fa-regular-400.ttf ///Symbol count: 163 /// @@ -234,7 +235,7 @@ public static class FontAweSomeV6Regular } /// -///Font Awesome version: 6.7.1 +///Font Awesome version: 6.7.2 ///fa-brands-400.ttf ///Symbol count: 495 /// @@ -738,7 +739,7 @@ public static class FontAweSomeV6Brands } /// -///Font Awesome version: 6.7.1 +///Font Awesome version: 6.7.2 ///fa-solid-900.ttf ///Symbol count: 1402 /// diff --git a/SunnyUI/Font/UFontImages.cs b/SunnyUI/Font/UFontImages.cs index 41ffcc20..a585c1b0 100644 --- a/SunnyUI/Font/UFontImages.cs +++ b/SunnyUI/Font/UFontImages.cs @@ -96,8 +96,8 @@ namespace Sunny.UI int item = GetFontSize(iconText, imageSize); if (Fonts.ContainsKey(item + offset)) return Fonts[item + offset]; - else if (Fonts.ContainsKey(item)) - return Fonts[item]; + else if (Fonts.TryGetValue(item, out Font font)) + return font; else return null; } @@ -191,7 +191,7 @@ namespace Sunny.UI { string path = @"D:\Temp\Font-Awesome-6.x\"; string scss = path + @"scss\_variables.scss"; - string version = "Font Awesome version: 6.7.1"; + string version = "Font Awesome version: 6.7.2"; string[] lines = File.ReadAllLines(scss); @@ -210,8 +210,8 @@ namespace Sunny.UI * 如果您使用此代码，请保留此说明。 ****************************************************************************** * 文件名称: UFontAwesomeV6.cs - * 文件说明: 字体图片定义类：FontAweSome，V6.7.1 - * 当前版本: V3.8.0 + * 文件说明: 字体图片定义类：FontAweSome，V6.7.2 + * 当前版本: V3.8.1 * 创建日期: 2023-04-23 * * 2023-04-23: V3.3.5 增加文件说明 @@ -219,6 +219,7 @@ namespace Sunny.UI * 2024-06-27: V3.6.7 减小文件大小 * 2024-07-21: V3.6.8 更新为Font Awesome version: 6.6.0 * 2024-11-27: V3.8.0 更新为Font Awesome version: 6.7.1 + * 2025-01-06: V3.8.1 更新为Font Awesome version: 6.7.2 ******************************************************************************/ /****************************************************************************** diff --git a/SunnyUI/Font/fa-brands-400.ttf b/SunnyUI/Font/fa-brands-400.ttf index a4c84545393fc98b7f4bcabbb9c93b4dea51cfa6..5841b28c5b975577b4887d6894ab6b305775fdea 100644 GIT binary patch delta 2926 zcmZ`*4^)-q9e#fA{q7&|N+|boufjzT;vypBB5+kuQL)fjL#5_%X0TwQ17U!Zl)R)a zsN)t*^0ISSLx)L6Do`vkRHhu~78))}R+!ExS(1{eqs<-n;Bd#YvvGL7@AvO{p5M!P zf!lo5JaE-q9p{-_x#SiQsX^Ve-3L(fuRHQwo%10j0sfhBV>^ z@Y4=p<0+twy|PYVGwaXLeoGAC;hd)xsHg+BHUisL5JSMvdV$Iapehe|p0yWf_Cf=& zLnCsCKH%qE@fVrEix#3DsLrQW^#JfvIj}R7U|hqvhQlwH0lPTt4JImpTAKgb47^eV z{H7MD-vR8V@E(6+7-*;i_C^4&CJ^1gz6Rj6bYMTt_H({TBdUQn;(#}6fM)hvir~Qk z3Lh8(S}Fe4AkaqA;SAv2G@zZvN4U%}F44hdIy!(86g<%mbT$GfDfD~BeeBY-(dY_25@T!@Hb+382Gjb_4oTOA$os^AqrwF zB8GU8Iw3v-kTEkLW{(CLn+fsHfs9Lm1XMsQsSs-xBrpMDCuu@AWFqG#ZYLNAk?deE zBpt$QCzBc>Vg8WG#^1|;EHy)xGhf~b$vg#ljPDf}AuCfMKUf8iJW&H#T?BcOg)9m`r4a*=+qyL}Xg>3T+mQ8TkRr|$mlDiNwnLuIfNY}4=3z*A6XcnG$QIVO(6B;- zJj>;_4nnpqfjn0ZsWf}|$l))43egLBp2jc6L8|>BFZDov$)TO?keW8g%XXp;vWxXs zOpx8RkUeRThCIk#&c7N3*+c7K<4i7=z^{{ay z7;=<@M>`?MxLHRiL80R$oS;c(3gjf;e;9L8cc_k6}jKZ%#Q(LfL63JnJBL>c5NMXu5G zIz_&zhTI&6+-ipmr$fHI0lCe&f3kjuf_Ey2HYh2A(xpRbe48Sme6pa-ols-bpdRRk zvan_;B^cYf;88(cP{C19A$3GQRA>`a*b?G4)Poe9(nt(KMQ?|i8UqzWftY-#*cni9 zAjpYNfJ&%>O00oOqPV*iYNiQ_msrhWKg9wyI|XV^In>;0sCk@SK#jCg57a^?yuoS_ zu{Zo~8~g8cKpn1!YNz>;?NG;ffR1#i-;r~C2&$9yPHLUx?0bVy zyf^A}1Js!)sO}o5vz%M`0Zn^Y_^1l%To=^G6;Pk-fa+TTbv_j8(z7O?{p~MX_yg+ zP()(}Qn47B_#ui>iCt*G8)(CEoChS{W^_e{Pc}MTNz-jcw=vM>c11e>Z)CL?ZLXxm z1g9~{ZF3onPNU6f5McQY2it7MshmI9cT-*2`mBH zxbfr1X#tkm27@6yWNesorJtXl!)mdIrdh4l0F&Lva5f-%YJ!EEcvoG~aAC zhdD`mOw%YaDz=hJj)`_dn8_AY$T&LC&rkEQ`-)y~iuS}%%;0CV8_b$%{5@fffv<&b zkpTe#wh`$CW5;qAN=v#*PF~@jrq{2sikcuJ*^1<3B^@Ih*>y%zO#xPm?^IH)4!=;_ zB2q)b4bHID+-mf6mVo+6BPFxPpT`TeTda=RJf6ju+)4LuVe~WDOq$u?%c76w=NC9d zA8pd>#djf3VxQtQ`uD9joX6KA42)hYjFOir>LYJv~nDJ#|MBbvpB15{#0LVtb zRFc2sscd!RNCx02;l6ZHc2R-)xo!sYCh8*=XD`Z~w0Yt&Xv5k8ougpMvcf-Hjn05J zoN3!w2qK{wHC*hTT{?G2>J1E3OaPaj>`b}0);2Fx>hA4*soD==-c(>&EWvS>n~B4~ z3XZa}94KP0s0>(5zPK4!a~)Vqowpb$$pO|C0P7=&df>S#U_&Rc(FJTGx9J4%yL{k< zCZH^is0Mxy;6*#p25im)$`j~SUIV<84!qm}Y++o%xPszW(txcLZ@moorVwnttp#{J z33y{3P?ZU6r}6eyU`GQ`okMg2J8uDhtOR!D18)Wbe`2#e)bDBHuOJI}s|R>{Hc-QS zZ4$hwrSUuUz&@J4TL;v$=%5WaWCjki@evMlltVPwiH*Q98XhkN8Vi7rX!IAxe`C$b zPT*7(aGJHJ>G}6&;0)uBD}b}~YDoY-i6vNnJ`1?e1AJ!p0-tk|i!8X*&P&k>e8EOv z#sU913|z?ozM?@Fxvm!A>w2J@#@ET;umLwSf$xYOzJc$Phz{Vt>AVHa5UGM_^B}rb zh`t+QOd{%ek;)(eHIRY4R0F+DkU@4xU>qb!2ML)1v6vu3V~JZ38;kC%B&ZuUm0%pk zVmou;fe>Ch8D0R1XoWD76*xAdM&H5R89T0-00=nOq8ah#phY2{w6z z+G!vd|I!A@Xo1Y+er6dYvm7#uYu0Ya<2>XOBjA-evmw7ug3Ki`m&Q*vL7u9Cxe4ICN_St2eP>p^3pcQ%M@)Xg;bOf?T}Y;AX~}5 z)(qJ`53<7ysdf?6@9c)`V$mVm%Ax+hgQ#QzHJEYkRIm=;MnjoK$ zKi2{|Uj_LG^Pd(&E@VL3+93ZdhkWjWwC546kc&Bxe=+a9#2=Sg_$4Rm*ao@E23Ol5 zooSFRntaWs*J$!>7UV_)$IZg_*$6ygyZ)Gtz@rj|oZuZGHKhMK|rOg4Xv4S!VwHD@gP>UL% ze#_i4Hdq-*bVC)f>8b*#XVRcn7ef`ZZcRIsm$fAv;Mqo~buPl&47Gk6)N@=nP*Bd- z^=diP8!b>(G~ZDKwU?)Ui<8$~hT5M&u<-%r-`favFb|6Vr__SrX?mpw3r7eL4l|LMBvO1knNYSs_$= z0o1=6puVVq>L`V}Vurd(zS9NuRVq|hD^zz9)HgJ}#{IW-{?FbmvGaEBdoyO*67SvH zcaJDdjw1je2ty29NWo-G!z|1}E|y>=%J3?7<3k|C>a-e+PIsc`ext`2YW28doO*-N zO2TPO@HpKDKQ&(Ov^x7(kHw#K8r`8oS=vt;4SvGo^!PPimTG-YMm=LUN&S!J&P2bV z(W;U0xSehzJB0cl4|g=|oq%Rmqm>G)+r!X5)XE#`vG;<9fY5 zD%>0yv)W+r8hWEU9hLyADcCYdvl$FFP4dlVb9j_tWMobs5oEL3n6?Z!7ags|#Aua6 z?SqF~L)`YEA=cr8?;Pse%2tcT5^S;!u-xgBy$~NCZ?+9oO6hb4gVC)|?)5QQje&-O zsHiCYFt0tr5E;HQ+3m82i3+#O8trzC9UB=rc#tU|+z}V&mU^qzKN;uiUkf8+{NtAf z1^Xun3chf!>4iQfIOu_U2i(oW@cW70F^5R{|4nW1pK-eXklB5*I}ekI*T)+S2Az&G z545HA8b#_O9QTbknM_tgpoym^}#_SMvQa0Tux_b==!3{=Zh-k zKvAWtT{m(CKWzP90te3Y#|p+?#?Nbr#!TPzFwH7P-_v1Q${;@{x&Y=99Pe&7DsqIIB8oQ8}EDFp_zQ=!nJr`TDUfVE@vFt+yg7ZwQIKj0Vhg`H~;_u diff --git a/SunnyUI/Font/fa-regular-400.ttf b/SunnyUI/Font/fa-regular-400.ttf index 2b0828b8956af7cc750877a7b554668415e78d72..d75d4c6a605facf886e8b6b38f2e3c46ed7c5ce6 100644 GIT binary patch delta 490 zcmYk!&r1S990l+<`$JP96@yF(>=H`3=$bAJT9jLac;S67Pfm|d&0af!#tR_H zTlwO4^5OOlFl&IV2?B^#8Hdi(vt{S#CmaG=tA3EJ{?F=TU!%0&O0q@ZM}=E}6*Jr- z2HLN!jMR~lq2iurEb!ul+m2!ONVXEI9U*LF5m3bbPQJsG`F%;s|eO^Yj$Xfhs)soZP zm_d4JcG1_SGL(Ui0*c5Yj~oKf*p5R%1W_cJVr;5x1`uQoe!6J-L=~Z{H&e9#0vwuP Ap#T5? delta 474 zcmYk!%}WA77zXfXcGvu(R18w2*baq4iIeGCddP?l(WS_UAfgY6qBQ(S>X4WI0A()S z{2QV}x2{nTbnH?H(W!0`5xQ=>HiGYEe)G;VPn}71CRLK+f$yt2w>VQVpV zC~-?&851UO$@e|*;GNs1|1{c+v10&XZYSJW;C8k9MG(na)?<_82JMUf92KhE0{Tdb zTf{8+;Fh{FChQ91eBXnRaK~-K8dPpOf@Fu=iBZz&cNzUF%%YyLlT8;*lAPul3)oqcN(|g6ktsFa7J#3`) p!z9hgnyQ~rcB&0pDHKq|ps<=27bya)(emo=L#$s5UB7CA?GM!LVpRYD diff --git a/SunnyUI/Font/fa-solid-900.ttf b/SunnyUI/Font/fa-solid-900.ttf index 7922dc54ac401dcdeca32bf165b87dee446afff0..a0414182dca34041fdd585c0c4b4bd7a3a2753e2 100644 GIT binary patch delta 464 zcmYk2&nrYx6vw~!y?IAQlGHR_$&-|+@w|7(m_&X=CN-4Jl$FH9EX-rxl-MxzEX8JS zHg*=u0wp{A3D19Eva(P%_U>?%a~9{*r*poy?m^W&sG6r!`c?e(Y$i9k{kV4yvY!F{ zW6Sd^$MxDBh~EJ7A(*sH2DV=`EVqq)p+!TZ-VTemf3q3}Aqzq+2=yS01fg*s60_$n z8@I9;I$n1nNB->?;K(XZhylVJq~4X7QtdwxI#{Gxh7V~I_+~mrZ-?m{` AQ~&?~ delta 435 zcmYj~%}WAN6vfY*(Hj+EZKAY~fglt_=MBk7NM%J9R8Wg3TJ$MpkRvKYi$E9CE~-th zRl8_WiwJBT)jH;1h_=-taNlSz@GkECaX9DPQrTZB`_GcQ?J59 z;w?%kk$4Sme~><1oPycXtdL kf+A^9KwNV2s~jQmqSL8(