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

* UIStyle: 修复了几个可能引起自适应产生的问题。

Browse Source
This commit is contained in:
Sunny 2021-11-22 23:29:50 +08:00
parent aa32afad53
commit dd529fa203
2 changed files with 16 additions and 12 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.

22
SunnyUI/Common/UControl.cs
View File

@ -323,28 +323,32 @@ namespace Sunny.UI
return control.CreateGraphics().DpiX / 96.0f; return control.CreateGraphics().DpiX / 96.0f;
} }
// public static Font DPIScaleFont(this Control control)
// {
// return new Font(control.Font.FontFamily, control.Font.Size / control.DPIScale(),
// control.Font.Style, control.Font.Unit, control.Font.GdiCharSet);
// }
public static Font DPIScaleFont(this Control control, Font font) public static Font DPIScaleFont(this Control control, Font font)
{ {
return new Font(font.FontFamily, font.Size / control.DPIScale(), if (UIStyles.DPIScale)
font.Style, font.Unit, font.GdiCharSet); return new Font(font.FontFamily, font.Size / control.DPIScale(), font.Style, font.Unit, font.GdiCharSet);
else
return font;
} }
public static Font DPIScaleFont(this Font font) public static Font DPIScaleFont(this Font font)
{
if (UIStyles.DPIScale)
{ {
using Control control = new(); using Control control = new();
return new Font(font.FontFamily, font.Size / control.DPIScale(), return new Font(font.FontFamily, font.Size / control.DPIScale(),
font.Style, font.Unit, font.GdiCharSet); font.Style, font.Unit, font.GdiCharSet);
} }
else
{
return font;
}
}
public static void SetDPIScaleFont(this Control control) public static void SetDPIScaleFont(this Control control)
{ {
if (!control.DPIScale().Equals(1)) if (!UIStyles.DPIScale) return;
if (!control.DPIScale().EqualsFloat(1))
{ {
if (control is IStyleInterface ctrl) if (control is IStyleInterface ctrl)
{ {