zhaoyushun1999/SunnyUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* UIButton: 修复LightStyle的文字颜色

Browse Source 
* UISymbolButton: 修复LightStyle的文字和图标颜色
This commit is contained in:
Sunny 2023-11-24 14:12:32 +08:00
parent 1b24896190
commit 2b8e1bd4f8
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SunnyUI/Controls/UIButton.cs
View File

@ -29,6 +29,7 @@
* 2022-08-25: V3.2.3 增加同一个容器的相同GroupIndex的按钮控件的Selected单选
* 2023-05-12: V3.3.6 重构DrawString函数
* 2023-07-02: V3.3.9 渐变色增加方向选择
* 2023-11-24: V3.6.2 修复LightStyle的文字颜色
******************************************************************************/
using System;
@ -61,6 +62,8 @@ namespace Sunny.UI
Height = 35;
Cursor = Cursors.Hand;
plainColor = UIStyles.Blue.PlainColor;
foreHoverColor = UIStyles.Blue.ButtonForeHoverColor;
forePressColor = UIStyles.Blue.ButtonForePressColor;
foreSelectedColor = UIStyles.Blue.ButtonForeSelectedColor;
@ -390,6 +393,8 @@ namespace Sunny.UI
{
base.SetStyleColor(uiColor);
plainColor = uiColor.PlainColor;
fillHoverColor = uiColor.ButtonFillHoverColor;
rectHoverColor = uiColor.ButtonRectHoverColor;
foreHoverColor = uiColor.ButtonForeHoverColor;

22
SunnyUI/Controls/UIControl.cs
View File

@ -467,7 +467,7 @@ namespace Sunny.UI
protected Color GetForeColor()
{
//文字
Color color = lightStyle ? _style.Colors().ButtonForeLightColor : foreColor;
Color color = lightStyle ? rectColor : foreColor;
if (IsHover)
color = foreHoverColor;
if (IsPress)
@ -488,7 +488,7 @@ namespace Sunny.UI
protected Color GetFillColor()
{
//填充
Color color = lightStyle ? _style.Colors().ButtonFillLightColor : fillColor;
Color color = lightStyle ? plainColor : fillColor;
if (IsHover)
color = fillHoverColor;
if (IsPress)
@ -632,6 +632,11 @@ namespace Sunny.UI
Invalidate();
}
/// <summary>
/// 填充浅色
/// </summary>
protected Color plainColor = UIStyles.Blue.PlainColor;
/// <summary>
/// 填充颜色
/// </summary>
@ -729,6 +734,19 @@ namespace Sunny.UI
/// </summary>
protected Color foreReadOnlyColor = UIStyles.Blue.ForeDisableColor;
/// <summary>
/// 设置选中颜色
/// </summary>
/// <param name="color">颜色</param>
protected void SetPlainColor(Color color)
{
if (plainColor != color)
{
plainColor = color;
Invalidate();
}
}
/// <summary>
/// 设置选中颜色
/// </summary>

3
SunnyUI/Controls/UISymbolButton.cs
View File

@ -22,6 +22,7 @@
* 2022-03-19: V3.1.1 重构主题配色
* 2023-05-15: V3.3.6 重构DrawString函数
* 2023-05-16: V3.3.6 重构DrawFontImage函数
* 2023-11-24: V3.6.2 修复LightStyle的文字和图标颜色
******************************************************************************/
using System;
@ -356,7 +357,7 @@ namespace Sunny.UI
protected Color GetSymbolForeColor()
{
//文字
Color color = lightStyle ? _style.Colors().ButtonForeLightColor : symbolColor;
Color color = lightStyle ? rectColor : symbolColor;
if (IsHover)
color = symbolHoverColor;
if (IsPress)