diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe index 83df4954..67ab1cfd 100644 Binary files a/Bin/net40/SunnyUI.Demo.exe and b/Bin/net40/SunnyUI.Demo.exe differ diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll index 8522c53b..119fac0c 100644 Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ diff --git a/SunnyUI/Controls/UIControl.cs b/SunnyUI/Controls/UIControl.cs index 46d5f029..93210e90 100644 --- a/SunnyUI/Controls/UIControl.cs +++ b/SunnyUI/Controls/UIControl.cs @@ -279,7 +279,7 @@ namespace Sunny.UI Invalidate(); } - private UIStyle _style = UIStyle.Blue; + protected UIStyle _style = UIStyle.Blue; /// /// 主题样式 diff --git a/SunnyUI/Controls/UISymbolButton.cs b/SunnyUI/Controls/UISymbolButton.cs index 94894b57..ed5d4739 100644 --- a/SunnyUI/Controls/UISymbolButton.cs +++ b/SunnyUI/Controls/UISymbolButton.cs @@ -18,6 +18,7 @@ * * 2020-01-01: V2.2.0 增加文件说明 * 2020-07-26: V2.2.6 增加Image属性,增加图片和文字的摆放位置 + * 2022-01-05: V3.0.9 字体图标增加颜色设置 ******************************************************************************/ using System; @@ -54,6 +55,29 @@ namespace Sunny.UI } } + private Color symbolColor = Color.White; + [Description("图标颜色"), Category("SunnyUI")] + [DefaultValue(typeof(Color), "White")] + public Color SymbolColor + { + get => symbolColor; + set + { + if (symbolColor != value) + { + symbolColor = value; + _style = UIStyle.Custom; + Invalidate(); + } + } + } + + public override void SetStyleColor(UIBaseStyle uiColor) + { + symbolColor = uiColor.ButtonForeColor; + base.SetStyleColor(uiColor); + } + [DefaultValue(null)] [Description("图片"), Category("SunnyUI")] public Image Image @@ -215,7 +239,7 @@ namespace Sunny.UI { if (Symbol > 0 && Image == null) { - e.Graphics.DrawFontImage(Symbol, SymbolSize, color, + e.Graphics.DrawFontImage(Symbol, SymbolSize, symbolColor, new RectangleF( (Width - ImageSize.Width) / 2.0f, Padding.Top + (Height - ImageSize.Height - Padding.Top - Padding.Bottom) / 2.0f, @@ -237,7 +261,7 @@ namespace Sunny.UI if (Symbol > 0 && Image == null) { - e.Graphics.DrawFontImage(Symbol, SymbolSize, color, + e.Graphics.DrawFontImage(Symbol, SymbolSize, symbolColor, new RectangleF((Width - allWidth) / 2.0f, (Height - ImageSize.Height) / 2.0f, ImageSize.Width, ImageSize.Height), SymbolOffset.X, SymbolOffset.Y); } @@ -308,7 +332,7 @@ namespace Sunny.UI if (Symbol > 0 && Image == null) { - e.Graphics.DrawFontImage(Symbol, SymbolSize, color, + e.Graphics.DrawFontImage(Symbol, SymbolSize, symbolColor, new RectangleF(left, top, ImageSize.Width, ImageSize.Height), SymbolOffset.X, SymbolOffset.Y); }