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

UISymbolLabel：修复Dock和AutoSize同时设置的Bug

Browse Source
This commit is contained in:
Sunny 2021-12-24 11:11:37 +08:00
parent 47a4686b8e
commit 4e8772c0f6
2 changed files with 6 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.

9
SunnyUI/Controls/UISymbolLabel.cs
View File

@ -17,6 +17,7 @@
* 创建日期: 2020-01-01 * 创建日期: 2020-01-01
* *
* 2020-04-23: V2.2.4 增加UISymbolLabel * 2020-04-23: V2.2.4 增加UISymbolLabel
* 2021-12-24: V3.0.9 修复Dock和AutoSize同时设置的Bug
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -219,10 +220,12 @@ namespace Sunny.UI
SizeF ImageSize = e.Graphics.GetFontImageSize(Symbol, SymbolSize); SizeF ImageSize = e.Graphics.GetFontImageSize(Symbol, SymbolSize);
SizeF TextSize = e.Graphics.MeasureString(Text, Font); SizeF TextSize = e.Graphics.MeasureString(Text, Font);
if (autoSize) if (Dock == DockStyle.None && autoSize)
{ {
Width = (int)(SymbolSize + ImageInterval * 3 + TextSize.Width); int width = (int)(SymbolSize + ImageInterval * 3 + TextSize.Width);
Height = (int)Math.Max(SymbolSize, TextSize.Height); int height = (int)Math.Max(SymbolSize, TextSize.Height);
if (Width != width) Width = width;
if (Height != height) Height = height;
} }
if (TextAlign == ContentAlignment.TopCenter || TextAlign == ContentAlignment.TopLeft || TextAlign == ContentAlignment.TopRight) if (TextAlign == ContentAlignment.TopCenter || TextAlign == ContentAlignment.TopLeft || TextAlign == ContentAlignment.TopRight)