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 a4c84545..5841b28c 100644
Binary files a/SunnyUI/Font/fa-brands-400.ttf and b/SunnyUI/Font/fa-brands-400.ttf differ
diff --git a/SunnyUI/Font/fa-regular-400.ttf b/SunnyUI/Font/fa-regular-400.ttf
index 2b0828b8..d75d4c6a 100644
Binary files a/SunnyUI/Font/fa-regular-400.ttf and b/SunnyUI/Font/fa-regular-400.ttf differ
diff --git a/SunnyUI/Font/fa-solid-900.ttf b/SunnyUI/Font/fa-solid-900.ttf
index 7922dc54..a0414182 100644
Binary files a/SunnyUI/Font/fa-solid-900.ttf and b/SunnyUI/Font/fa-solid-900.ttf differ