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

* UIForm, UIPage: 增加TitleFont属性

Browse Source
This commit is contained in:
Sunny 2021-08-16 16:42:16 +08:00
parent a57c892636
commit 122f0f402e
8 changed files with 46 additions and 5 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.

BIN
Bin/net462/SunnyUI.dll
View File

Binary file not shown.

BIN
Bin/net5.0-windows/SunnyUI.dll
View File

Binary file not shown.

BIN
Bin/net5.0-windows/ref/SunnyUI.dll
View File

Binary file not shown.

BIN
Bin/netcoreapp3.1/SunnyUI.dll
View File

Binary file not shown.

27
SunnyUI/Forms/UIForm.cs
View File

@ -397,6 +397,27 @@ namespace Sunny.UI
}
}
/// <summary>
/// 标题字体
/// </summary>
private Font titleFont = UIFontColor.Font;
/// <summary>
/// 标题字体
/// </summary>
[Description("标题字体"), Category("SunnyUI")]
[DefaultValue(typeof(Font), "微软雅黑, 12pt")]
public Font TitleFont
{
get => titleFont;
set
{
titleFont = value;
Invalidate();
}
}
private Rectangle ControlBoxRect;
private Rectangle MaximizeBoxRect;
@ -1020,14 +1041,14 @@ namespace Sunny.UI
}
}
SizeF sf = e.Graphics.MeasureString(Text, Font);
SizeF sf = e.Graphics.MeasureString(Text, TitleFont);
if (TextAlignment == StringAlignment.Center)
{
e.Graphics.DrawString(Text, Font, titleForeColor, (Width - sf.Width) / 2, (TitleHeight - sf.Height) / 2);
e.Graphics.DrawString(Text, TitleFont, titleForeColor, (Width - sf.Width) / 2, (TitleHeight - sf.Height) / 2);
}
else
{
e.Graphics.DrawString(Text, Font, titleForeColor, 6 + (ShowTitleIcon && Icon != null ? 26 : 0), (TitleHeight - sf.Height) / 2);
e.Graphics.DrawString(Text, TitleFont, titleForeColor, 6 + (ShowTitleIcon && Icon != null ? 26 : 0), (TitleHeight - sf.Height) / 2);
}
}

24
SunnyUI/Pages/UIPage.cs
View File

@ -341,8 +341,8 @@ namespace Sunny.UI
e.Graphics.DrawFontImage(Symbol, SymbolSize, TitleForeColor, new Rectangle(ImageInterval, 0, SymbolSize, TitleHeight), SymbolOffset.X, SymbolOffset.Y);
}
SizeF sf = e.Graphics.MeasureString(Text, Font);
e.Graphics.DrawString(Text, Font, TitleForeColor,
SizeF sf = e.Graphics.MeasureString(Text, TitleFont);
e.Graphics.DrawString(Text, TitleFont, TitleForeColor,
Symbol > 0 ? ImageInterval * 2 + SymbolSize : ImageInterval, (TitleHeight - sf.Height) / 2);
e.Graphics.SetHighQuality();
@ -420,6 +420,26 @@ namespace Sunny.UI
}
}
/// <summary>
/// 标题字体
/// </summary>
private Font titleFont = UIFontColor.Font;
/// <summary>
/// 标题字体
/// </summary>
[Description("标题字体"), Category("SunnyUI")]
[DefaultValue(typeof(Font), "微软雅黑, 12pt")]
public Font TitleFont
{
get => titleFont;
set
{
titleFont = value;
Invalidate();
}
}
private int imageInterval = 6;
public int ImageInterval