From 49cda26702bf48439b6d549e50d75562dee1362c Mon Sep 17 00:00:00 2001 From: Sunny Date: Wed, 25 Oct 2023 15:10:47 +0800 Subject: [PATCH] =?UTF-8?q?*=20UFontImage:=20MaterialIcons=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E5=9B=BE=E6=A0=87=E8=B0=83=E5=A4=A73=E4=B8=AA?= =?UTF-8?q?=E5=83=8F=E7=B4=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SunnyUI/Font/UFontImageHelper.cs | 3 ++- SunnyUI/Font/UFontImages.cs | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/SunnyUI/Font/UFontImageHelper.cs b/SunnyUI/Font/UFontImageHelper.cs index 5141c663..05ab5e6e 100644 --- a/SunnyUI/Font/UFontImageHelper.cs +++ b/SunnyUI/Font/UFontImageHelper.cs @@ -23,6 +23,7 @@ * 2021-06-15: V3.3.5 增加FontAwesomeV6的字体图标，重构代码 * 2023-05-16: V3.3.6 重构DrawFontImage函数 * 2022-05-17: V3.3.7 修复了一个窗体属性编辑器图标显示不全的问题 + * 2023-10-25: V3.5.1 MaterialIcons字体图标调大3个像素 ******************************************************************************/ using System.Collections.Generic; @@ -197,7 +198,7 @@ namespace Sunny.UI case UISymbolType.FontAwesomeV6Solid: return Fonts[UISymbolType.FontAwesomeV6Solid].GetFont(symbolValue, imageSize); case UISymbolType.MaterialIcons: - return Fonts[UISymbolType.MaterialIcons].GetFont(symbolValue, imageSize); + return Fonts[UISymbolType.MaterialIcons].GetFont(symbolValue, imageSize, 3); default: return null; } diff --git a/SunnyUI/Font/UFontImages.cs b/SunnyUI/Font/UFontImages.cs index 8b29ef43..408cb6b9 100644 --- a/SunnyUI/Font/UFontImages.cs +++ b/SunnyUI/Font/UFontImages.cs @@ -89,10 +89,15 @@ namespace Sunny.UI /// 鍥炬爣 /// 鍥炬爣澶у皬 /// 瀛椾綋 - public Font GetFont(int iconText, int imageSize) + public Font GetFont(int iconText, int imageSize, int offset = 0) { int item = GetFontSize(iconText, imageSize); - return Fonts.ContainsKey(item) ? Fonts[item] : null; + if (Fonts.ContainsKey(item + offset)) + return Fonts[item + offset]; + else if (Fonts.ContainsKey(item)) + return Fonts[item]; + else + return null; } ///