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

* UIButton: 增加是否显示浅色背景LightStyle

Browse Source
This commit is contained in:
Sunny 2022-03-31 16:44:23 +08:00
parent 43d7ff6ad5
commit aa409b0d7b
5 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Bin/net40/SunnyUI.dll
View File

Binary file not shown.

16
SunnyUI/Controls/UIButton.cs
View File

@ -25,6 +25,7 @@
* 2021-12-11: V3.0.9 增加了渐变色 * 2021-12-11: V3.0.9 增加了渐变色
* 2022-02-26: V3.1.1 增加了AutoSize属性 * 2022-02-26: V3.1.1 增加了AutoSize属性
* 2022-03-19: V3.1.1 重构主题配色 * 2022-03-19: V3.1.1 重构主题配色
* 2022-03-31: V3.1.2 是否显示浅色背景
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -64,6 +65,21 @@ namespace Sunny.UI
SetStyle(ControlStyles.StandardDoubleClick, UseDoubleClick); SetStyle(ControlStyles.StandardDoubleClick, UseDoubleClick);
} }
[DefaultValue(false)]
[Description("是否显示浅色背景"), Category("SunnyUI")]
public bool LightStyle
{
get => lightStyle;
set
{
if (lightStyle != value)
{
lightStyle = value;
Invalidate();
}
}
}
private bool autoSize; private bool autoSize;
[Browsable(true), DefaultValue(false)] [Browsable(true), DefaultValue(false)]

6
SunnyUI/Controls/UIControl.cs
View File

@ -364,6 +364,8 @@ namespace Sunny.UI
} }
} }
protected bool lightStyle;
/// <summary> /// <summary>
/// OnPaint /// OnPaint
/// </summary> /// </summary>
@ -436,7 +438,7 @@ namespace Sunny.UI
protected Color GetForeColor() protected Color GetForeColor()
{ {
//文字 //文字
Color color = foreColor; Color color = lightStyle ? _style.Colors().ButtonForeLightColor : foreColor;
if (IsHover) if (IsHover)
color = foreHoverColor; color = foreHoverColor;
if (IsPress) if (IsPress)
@ -457,7 +459,7 @@ namespace Sunny.UI
protected Color GetFillColor() protected Color GetFillColor()
{ {
//填充 //填充
Color color = fillColor; Color color = lightStyle ? _style.Colors().ButtonFillLightColor : fillColor;
if (IsHover) if (IsHover)
color = fillHoverColor; color = fillHoverColor;
if (IsPress) if (IsPress)

2
SunnyUI/Controls/UISymbolButton.cs
View File

@ -307,7 +307,7 @@ namespace Sunny.UI
protected Color GetSymbolForeColor() protected Color GetSymbolForeColor()
{ {
//文字 //文字
Color color = symbolColor; Color color = lightStyle ? _style.Colors().ButtonForeLightColor : symbolColor;
if (IsHover) if (IsHover)
color = symbolHoverColor; color = symbolHoverColor;
if (IsPress) if (IsPress)

10
SunnyUI/Style/UIStyleColor.cs
View File

@ -46,6 +46,8 @@ namespace Sunny.UI
public virtual Color ButtonFillPressColor { get; protected set; } public virtual Color ButtonFillPressColor { get; protected set; }
public virtual Color ButtonFillSelectedColor { get; protected set; } public virtual Color ButtonFillSelectedColor { get; protected set; }
public virtual Color ButtonFillColor2 { get; protected set; } public virtual Color ButtonFillColor2 { get; protected set; }
public virtual Color ButtonFillLightColor { get; protected set; }
public virtual Color ButtonForeLightColor { get; protected set; }
public virtual Color ButtonForeColor { get; protected set; } public virtual Color ButtonForeColor { get; protected set; }
public virtual Color ButtonForeHoverColor { get; protected set; } public virtual Color ButtonForeHoverColor { get; protected set; }
@ -276,6 +278,8 @@ namespace Sunny.UI
ButtonFillPressColor = colors1[3]; ButtonFillPressColor = colors1[3];
ButtonFillSelectedColor = colors1[3]; ButtonFillSelectedColor = colors1[3];
ButtonFillColor2 = ButtonFillColor; ButtonFillColor2 = ButtonFillColor;
ButtonFillLightColor = PlainColor;
ButtonForeLightColor = PrimaryColor;
ButtonForeColor = reverseColor; ButtonForeColor = reverseColor;
ButtonForeHoverColor = reverseColor; ButtonForeHoverColor = reverseColor;
@ -496,6 +500,9 @@ namespace Sunny.UI
FormBackColor = PrimaryColor; FormBackColor = PrimaryColor;
FormControlBoxForeColor = ForeColor; FormControlBoxForeColor = ForeColor;
ButtonFillLightColor = UIStyles.Blue.PlainColor;
ButtonForeLightColor = UIStyles.Blue.PrimaryColor;
PageBackColor = PlainColor; PageBackColor = PlainColor;
PageRectColor = PrimaryColor; PageRectColor = PrimaryColor;
PageForeColor = ForeColor; PageForeColor = ForeColor;
@ -608,6 +615,9 @@ namespace Sunny.UI
FormBackColor = PrimaryColor; FormBackColor = PrimaryColor;
FormControlBoxForeColor = ForeColor; FormControlBoxForeColor = ForeColor;
ButtonFillLightColor = UIStyles.Blue.PlainColor;
ButtonForeLightColor = UIStyles.Blue.PrimaryColor;
PageBackColor = PlainColor; PageBackColor = PlainColor;
PageRectColor = PrimaryColor; PageRectColor = PrimaryColor;
PageForeColor = ForeColor; PageForeColor = ForeColor;