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

* UITextBox: 修改全局字体调整后的默认高度

Browse Source
This commit is contained in:
Sunny 2023-10-26 11:01:28 +08:00
parent 85a56809f1
commit a266d608ff
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SunnyUI/Controls/DropItem/UIDropControl.cs
View File

@ -64,7 +64,7 @@ namespace Sunny.UI
edit.Invalidate(); edit.Invalidate();
Controls.Add(edit); Controls.Add(edit);
lastEditHeight = edit.Height; firstEditHeight = lastEditHeight = edit.Height;
Width = 150; Width = 150;
Height = 29; Height = 29;
@ -76,6 +76,7 @@ namespace Sunny.UI
ControlBoxRect = new Rectangle(Width - 24, 0, 24, Height); ControlBoxRect = new Rectangle(Width - 24, 0, 24, Height);
} }
int firstEditHeight = -1;
int lastEditHeight = -1; int lastEditHeight = -1;
private void Edit_SizeChanged(object sender, EventArgs e) private void Edit_SizeChanged(object sender, EventArgs e)
{ {
@ -411,6 +412,14 @@ namespace Sunny.UI
NoNeedChange = false; NoNeedChange = false;
} }
if (edit.Height + RectSize * 2 + 2 < firstEditHeight && Height > firstEditHeight)
{
NoNeedChange = true;
Height = firstEditHeight;
edit.Top = (Height - edit.Height) / 2;
NoNeedChange = false;
}
if (edit.Top != (Height - edit.Height) / 2 + 1) if (edit.Top != (Height - edit.Height) / 2 + 1)
{ {
edit.Top = (Height - edit.Height) / 2 + 1; edit.Top = (Height - edit.Height) / 2 + 1;

11
SunnyUI/Controls/UITextBox.cs
View File

@ -132,7 +132,7 @@ namespace Sunny.UI
bar.MouseEnter += Bar_MouseEnter; bar.MouseEnter += Bar_MouseEnter;
TextAlignment = ContentAlignment.MiddleLeft; TextAlignment = ContentAlignment.MiddleLeft;
lastEditHeight = edit.Height; firstEditHeight = lastEditHeight = edit.Height;
Width = 150; Width = 150;
Height = 29; Height = 29;
@ -140,6 +140,7 @@ namespace Sunny.UI
TextAlignmentChange += UITextBox_TextAlignmentChange; TextAlignmentChange += UITextBox_TextAlignmentChange;
} }
int firstEditHeight = -1;
int lastEditHeight = -1; int lastEditHeight = -1;
private void Edit_SizeChanged(object sender, EventArgs e) private void Edit_SizeChanged(object sender, EventArgs e)
{ {
@ -734,6 +735,14 @@ namespace Sunny.UI
NoNeedChange = false; NoNeedChange = false;
} }
if (edit.Height + RectSize * 2 + 2 < firstEditHeight && Height > firstEditHeight)
{
NoNeedChange = true;
Height = firstEditHeight;
edit.Top = (Height - edit.Height) / 2;
NoNeedChange = false;
}
if (edit.Top != (Height - edit.Height) / 2 + 1) if (edit.Top != (Height - edit.Height) / 2 + 1)
{ {
edit.Top = (Height - edit.Height) / 2 + 1; edit.Top = (Height - edit.Height) / 2 + 1;