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

* UIControl: 基类增加只读颜色设置

Browse Source
This commit is contained in:
Sunny 2022-02-16 14:20:44 +08:00
parent bf849c88d8
commit 4400968ade
8 changed files with 163 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Bin/net40/SunnyUI.Demo.exe
View File

Binary file not shown.

BIN
Bin/net40/SunnyUI.dll
View File

Binary file not shown.

50
SunnyUI/Controls/UIControl.cs
View File

@ -20,6 +20,7 @@
* 2020-04-25: V2.2.4 更新主题配置类
* 2021-12-13: V3.0.9 边框线宽可设置1或者2
* 2022-01-10: V3.1.0 调整边框和圆角的绘制
* 2022-02-16: V3.1.1 基类增加只读颜色设置
******************************************************************************/
using System;
@ -272,6 +273,10 @@ namespace Sunny.UI
rectDisableColor = uiColor.RectDisableColor;
foreDisableColor = uiColor.ForeDisableColor;
fillReadOnlyColor = uiColor.FillDisableColor;
rectReadOnlyColor = uiColor.RectDisableColor;
foreReadOnlyColor = uiColor.ForeDisableColor;
fillPressColor = fillHoverColor = fillColor;
rectPressColor = rectHoverColor = rectColor;
forePressColor = foreHoverColor = foreColor;
@ -616,6 +621,11 @@ namespace Sunny.UI
/// </summary>
protected Color foreDisableColor = UIStyles.GetStyleColor(UIStyle.Blue).ForeDisableColor;
/// <summary>
/// 字体只读颜色
/// </summary>
protected Color foreReadOnlyColor = UIStyle.Blue.Colors().ForeDisableColor;
/// <summary>
/// 边框鼠标移上颜色
/// </summary>
@ -631,6 +641,11 @@ namespace Sunny.UI
/// </summary>
protected Color rectDisableColor = UIStyles.GetStyleColor(UIStyle.Blue).RectDisableColor;
/// <summary>
/// 边框只读颜色
/// </summary>
protected Color rectReadOnlyColor = UIStyles.GetStyleColor(UIStyle.Blue).RectDisableColor;
/// <summary>
/// 填充鼠标移上颜色
/// </summary>
@ -646,6 +661,11 @@ namespace Sunny.UI
/// </summary>
protected Color fillDisableColor = UIStyles.GetStyleColor(UIStyle.Blue).FillDisableColor;
/// <summary>
/// 填充只读颜色
/// </summary>
protected Color fillReadOnlyColor = UIStyles.GetStyleColor(UIStyle.Blue).FillDisableColor;
/// <summary>
/// 设置选中颜色
/// </summary>
@ -720,6 +740,16 @@ namespace Sunny.UI
_style = UIStyle.Custom;
}
/// <summary>
/// 设置填充只读颜色
/// </summary>
/// <param name="color">颜色</param>
protected void SetFillReadOnlyColor(Color color)
{
fillReadOnlyColor = color;
_style = UIStyle.Custom;
}
/// <summary>
/// 设备边框鼠标移上颜色
/// </summary>
@ -750,6 +780,16 @@ namespace Sunny.UI
_style = UIStyle.Custom;
}
/// <summary>
/// 设置边框只读颜色
/// </summary>
/// <param name="color">颜色</param>
protected void SetRectReadOnlyColor(Color color)
{
rectReadOnlyColor = color;
_style = UIStyle.Custom;
}
/// <summary>
/// 设置字体鼠标移上颜色
/// </summary>
@ -780,6 +820,16 @@ namespace Sunny.UI
_style = UIStyle.Custom;
}
/// <summary>
/// 设置字体只读颜色
/// </summary>
/// <param name="color">颜色</param>
protected void SetForeReadonlyColor(Color color)
{
foreReadOnlyColor = color;
_style = UIStyle.Custom;
}
/// <summary>
/// 设置边框颜色
/// </summary>

51
SunnyUI/Controls/UIPanel.cs
View File

@ -24,6 +24,7 @@
* 2021-12-13: V3.0.9 边框线宽可设置1或者2
* 2022-01-10: V3.1.0 调整边框和圆角的绘制
* 2022-01-27: V3.1.0 禁止显示滚动条
* 2022-02-16: V3.1.1 基类增加只读颜色设置
******************************************************************************/
using System;
@ -566,9 +567,59 @@ namespace Sunny.UI
fillDisableColor = uiColor.FillDisableColor;
rectDisableColor = uiColor.RectDisableColor;
foreDisableColor = uiColor.ForeDisableColor;
fillReadOnlyColor = uiColor.FillDisableColor;
rectReadOnlyColor = uiColor.RectDisableColor;
foreReadOnlyColor = uiColor.ForeDisableColor;
Invalidate();
}
/// <summary>
/// 字体只读颜色
/// </summary>
protected Color foreReadOnlyColor = UIStyle.Blue.Colors().ForeDisableColor;
/// <summary>
/// 边框只读颜色
/// </summary>
protected Color rectReadOnlyColor = UIStyle.Blue.Colors().RectDisableColor;
/// <summary>
/// 填充只读颜色
/// </summary>
protected Color fillReadOnlyColor = UIStyle.Blue.Colors().FillDisableColor;
/// <summary>
/// 设置填充只读颜色
/// </summary>
/// <param name="color">颜色</param>
protected void SetFillReadOnlyColor(Color color)
{
fillReadOnlyColor = color;
_style = UIStyle.Custom;
}
/// <summary>
/// 设置边框只读颜色
/// </summary>
/// <param name="color">颜色</param>
protected void SetRectReadOnlyColor(Color color)
{
rectReadOnlyColor = color;
_style = UIStyle.Custom;
}
/// <summary>
/// 设置字体只读颜色
/// </summary>
/// <param name="color">颜色</param>
protected void SetForeReadOnlyColor(Color color)
{
foreReadOnlyColor = color;
_style = UIStyle.Custom;
}
/// <summary>
/// 字体颜色
/// </summary>

28
SunnyUI/Controls/UITextBox.cs
View File

@ -49,7 +49,6 @@ namespace Sunny.UI
private readonly UIScrollBar bar = new UIScrollBar();
private readonly UISymbolButton btn = new UISymbolButton();
public UITextBox()
{
InitializeComponent();
@ -141,6 +140,33 @@ namespace Sunny.UI
}
}
/// <summary>
/// 字体只读颜色
/// </summary>
public Color ForeReadOnlyColor
{
get => foreReadOnlyColor;
set => SetForeReadOnlyColor(value);
}
/// <summary>
/// 边框只读颜色
/// </summary>
public Color RectReadOnlyColor
{
get => rectReadOnlyColor;
set => SetRectReadOnlyColor(value);
}
/// <summary>
/// 填充只读颜色
/// </summary>
public Color FillReadOnlyColor
{
get => fillReadOnlyColor;
set => SetFillReadOnlyColor(value);
}
private void Btn_Click(object sender, EventArgs e)
{
ButtonClick?.Invoke(this, e);

12
SunnyUI/Forms/UIForm.cs
View File

@ -399,14 +399,21 @@ namespace Sunny.UI
}
}
private Color titleColor;
/// <summary>
/// 标题栏颜色
/// </summary>
[Description("标题栏颜色"), Category("SunnyUI"), DefaultValue(typeof(Color), "80, 160, 255")]
public Color TitleColor
{
get => RectColor;
set => RectColor = value;
get => titleColor;
set
{
titleColor = value;
_style = UIStyle.Custom;
Invalidate();
}
}
/// <summary>
@ -1206,6 +1213,7 @@ namespace Sunny.UI
rectColor = uiColor.RectColor;
foreColor = UIFontColor.Primary;
BackColor = uiColor.PlainColor;
titleColor = uiColor.TitleColor;
titleForeColor = uiColor.TitleForeColor;
Invalidate();
}

2
SunnyUI/Style/UIStyle.cs
View File

@ -568,7 +568,7 @@ namespace Sunny.UI
/// <summary>
/// 深蓝
/// </summary>
public static readonly Color DarkBlue = Color.FromArgb(15, 40, 70);
public static readonly Color DarkBlue = Color.FromArgb(26, 82, 137);
/// <summary>
/// 白

64
SunnyUI/Style/UIStyleColor.cs
View File

@ -537,63 +537,47 @@ namespace Sunny.UI
public class UIDarkBlueStyle : UIBaseStyle
{
public override UIStyle Name => UIStyle.DarkBlue;
public override Color PrimaryColor => Color.FromArgb(30, 32, 135);
public override Color RegularColor => Color.FromArgb(120, 148, 182);
public override Color SecondaryColor => Color.FromArgb(120, 148, 182);
public override Color PlainColor => Color.FromArgb(30, 32, 135);
public override Color ButtonFillColor => Color.FromArgb(2, 167, 240);
public override Color ButtonFillColor2 => Color.FromArgb(6, 13, 192);
public override Color ButtonFillHoverColor => Color.FromArgb(128, 255, 255);
public override Color ButtonFillPressColor => Color.FromArgb(108, 255, 255);
public override Color ButtonForeColor => Color.FromArgb(242, 242, 242);
public override Color ButtonFillColor => Color.FromArgb(26, 82, 137);
public override Color ButtonFillColor2 => Color.FromArgb(4, 41, 87);
public override Color ButtonFillHoverColor => Color.FromArgb(15, 61, 112);
public override Color ButtonFillPressColor => Color.FromArgb(4, 41, 87);
public override Color ButtonFillSelectedColor => this.ButtonFillPressColor;
public override Color ButtonForeColor => Color.FromArgb(157, 197, 205);
public override Color ButtonForeHoverColor => UIFontColor.Primary;
public override Color ButtonForePressColor => UIFontColor.Primary;
public override Color RectSelectedColor => Color.FromArgb(128, 255, 255);
public override Color ButtonForeSelectedColor => UIFontColor.Primary;
public override Color ButtonFillSelectedColor => Color.FromArgb(128, 255, 255);
public override Color RectColor => Color.FromArgb(128, 255, 255);
public override Color RectHoverColor => Color.FromArgb(128, 255, 255);
public override Color RectPressColor => Color.FromArgb(128, 255, 255);
public override Color LabelForeColor => UIFontColor.Plain;
public override Color DropDownControlColor => UIFontColor.Primary;
public override Color CheckBoxColor => UIColor.Blue;
public override Color TitleColor => Color.FromArgb(130, 130, 130);
public override Color TitleForeColor => Color.White;
public override Color LineForeColor => UIFontColor.Plain;
public override Color ContextMenuColor => UIColor.RegularGray;
public override Color GridStripeOddColor => UIColor.RegularGray;
public override Color DropDownControlColor => this.ButtonForeColor;
public override Color GridSelectedColor => UIFontColor.Plain;
public override Color GridSelectedForeColor => UIColor.White;
public override Color GridStripeOddColor => UIColor.RegularGray;
public override Color LabelForeColor => this.ButtonForeColor;
public override Color LineForeColor => this.ButtonForeColor;
public override Color ListItemSelectBackColor => UIColor.Blue;
public override Color ListItemSelectForeColor => UIColor.LightBlue;
public override Color ProgressIndicatorColor => UIColor.Blue;
public override Color ProcessBarFillColor => PlainColor;
public override Color PlainColor => UIColor.DarkBlue;
public override Color PrimaryColor => UIColor.DarkBlue;
public override Color ProcessBarFillColor => this.PlainColor;
public override Color ProcessBarForeColor => UIColor.RegularGray;
public override Color ProgressIndicatorColor => UIColor.Blue;
public override Color RectColor => Color.FromArgb(110, 202, 236);
public override Color RectHoverColor => this.RectColor;
public override Color RectPressColor => this.RectColor;
public override Color RectSelectedColor => this.RectColor;
public override Color RegularColor => Color.FromArgb(120, 148, 182);
public override Color ScrollBarForeColor => UIColor.RegularGray;
public override Color SecondaryColor => Color.FromArgb(120, 148, 182);
public override Color SwitchActiveColor => UIColor.DarkBlue;
public override Color SwitchInActiveColor => UIFontColor.Plain;
public override Color SwitchFillColor => Color.White;
public override Color SwitchInActiveColor => UIFontColor.Plain;
public override Color TitleColor => this.PrimaryColor;
public override Color TitleForeColor => this.ButtonForeColor;
public override Color TrackBarForeColor => UIColor.Blue;
public override Color TrackBarRectColor => UIColor.Blue;
public override Color TrackDisableColor => Color.Silver;
public override Color TreeViewSelectedColor => UIFontColor.Secondary;
public override Color TreeViewHoverColor => UIFontColor.Plain;
public override Color TreeViewSelectedColor => UIFontColor.Secondary;
}
public class UIBlackStyle : UIBaseStyle