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

* 重构DrawString函数

Browse Source
This commit is contained in:
Sunny 2023-05-07 22:15:38 +08:00
parent ca67c3bd28
commit c56dde9d4a
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SunnyUI/Controls/UICheckBox.cs
View File

@ -187,14 +187,11 @@ namespace Sunny.UI
/// <param name="path">绘图路径</param> /// <param name="path">绘图路径</param>
protected override void OnPaintFore(Graphics g, GraphicsPath path) protected override void OnPaintFore(Graphics g, GraphicsPath path)
{ {
//设置按钮标题位置
Padding = new Padding(_imageSize + _imageInterval * 2, Padding.Top, Padding.Right, Padding.Bottom);
//填充文字 //填充文字
Color color = foreColor; Color color = foreColor;
color = Enabled ? color : UIDisableColor.Fore; color = Enabled ? color : UIDisableColor.Fore;
Rectangle rect = new Rectangle(_imageSize + _imageInterval * 2, 0, Width - _imageSize + _imageInterval * 2, Height);
g.DrawString(Text, Font, color, Size, Padding, ContentAlignment.MiddleLeft); g.DrawString(Text, Font, color, rect, ContentAlignment.MiddleLeft);
} }
/// <summary> /// <summary>
@ -205,7 +202,7 @@ namespace Sunny.UI
protected override void OnPaintFill(Graphics g, GraphicsPath path) protected override void OnPaintFill(Graphics g, GraphicsPath path)
{ {
//图标 //图标
float top = Padding.Top - 1 + (Height - Padding.Top - Padding.Bottom - ImageSize) / 2.0f; float top = (Height - ImageSize) / 2.0f;
float left = Text.IsValid() ? ImageInterval : (Width - ImageSize) / 2.0f; float left = Text.IsValid() ? ImageInterval : (Width - ImageSize) / 2.0f;
Color color = Enabled ? fillColor : foreDisableColor; Color color = Enabled ? fillColor : foreDisableColor;

11
SunnyUI/Controls/UIRadioButton.cs
View File

@ -175,14 +175,11 @@ namespace Sunny.UI
/// <param name="path">绘图路径</param> /// <param name="path">绘图路径</param>
protected override void OnPaintFore(Graphics g, GraphicsPath path) protected override void OnPaintFore(Graphics g, GraphicsPath path)
{ {
//设置按钮标题位置
Padding = new Padding(_imageSize + _imageInterval * 2, Padding.Top, Padding.Right, Padding.Bottom);
//填充文字 //填充文字
Color color = ForeColor; Color color = foreColor;
color = Enabled ? color : UIDisableColor.Fore; color = Enabled ? color : UIDisableColor.Fore;
Rectangle rect = new Rectangle(_imageSize + _imageInterval * 2, 0, Width - _imageSize + _imageInterval * 2, Height);
g.DrawString(Text, Font, color, Size, Padding, ContentAlignment.MiddleLeft); g.DrawString(Text, Font, color, rect, ContentAlignment.MiddleLeft);
} }
/// <summary> /// <summary>
@ -193,7 +190,7 @@ namespace Sunny.UI
protected override void OnPaintFill(Graphics g, GraphicsPath path) protected override void OnPaintFill(Graphics g, GraphicsPath path)
{ {
//图标 //图标
float top = Padding.Top - 1 + (Height - Padding.Top - Padding.Bottom - ImageSize) / 2.0f; float top = (Height - ImageSize) / 2.0f;
float left = Text.IsValid() ? ImageInterval : (Width - ImageSize) / 2.0f; float left = Text.IsValid() ? ImageInterval : (Width - ImageSize) / 2.0f;
Color color = Enabled ? fillColor : foreDisableColor; Color color = Enabled ? fillColor : foreDisableColor;