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

* UITextBox: 修复高度不随字体改变

Browse Source 
* UIDropControl: 修复高度不随字体改变
This commit is contained in:
Sunny 2023-12-18 23:15:15 +08:00
parent 4cfdc8c795
commit 0019e7784d
2 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@
* 2023-10-25: V3.5.1 修复在高DPI下，文字垂直不居中的问题
* 2023-10-25: V3.5.1 修复在某些字体不显示下划线的问题
* 2023-10-26: V3.5.1 字体图标增加旋转角度参数SymbolRotate
* 2023-12-18: V3.6.2 修复高度不随字体改变
******************************************************************************/
using System;
@ -394,10 +395,10 @@ namespace Sunny.UI
{
base.OnSizeChanged(e);
if (!NoNeedChange)
{
SizeChange();
}
//if (!NoNeedChange)
//{
SizeChange();
//}
if (tipsBtn != null)
{
@ -405,17 +406,17 @@ namespace Sunny.UI
}
}
private bool NoNeedChange = false;
//private bool NoNeedChange = false;
private void SizeChange()
{
if (Height < edit.Height + RectSize * 2 + 2)
{
NoNeedChange = true;
Height = edit.Height + RectSize * 2 + 2;
edit.Top = (Height - edit.Height) / 2;
NoNeedChange = false;
}
//if (Height < edit.Height + RectSize * 2 + 2)
//{
// NoNeedChange = true;
// Height = edit.Height + RectSize * 2 + 2;
// edit.Top = (Height - edit.Height) / 2;
// NoNeedChange = false;
//}
if (edit.Top != (Height - edit.Height) / 2 + 1)
{

25
SunnyUI/Controls/UITextBox.cs
View File

@ -55,6 +55,7 @@
* 2023-10-25: V3.5.1 修复在某些字体不显示下划线的问题
* 2023-10-26: V3.5.1 字体图标增加旋转角度参数SymbolRotate
* 2023-11-16: V3.5.2 重构主题
* 2023-12-18: V3.6.2 修复高度不随字体改变
******************************************************************************/
using System;
@ -677,10 +678,10 @@ namespace Sunny.UI
{
base.OnSizeChanged(e);
if (!NoNeedChange)
{
SizeChange();
}
//if (!NoNeedChange)
//{
SizeChange();
//}
if (tipsBtn != null)
{
@ -707,7 +708,7 @@ namespace Sunny.UI
}
}
private bool NoNeedChange = false;
//private bool NoNeedChange = false;
private void SizeChange()
{
@ -717,13 +718,13 @@ namespace Sunny.UI
if (!multiline)
{
if (Height < edit.Height + RectSize * 2 + 2)
{
NoNeedChange = true;
Height = edit.Height + RectSize * 2 + 2;
edit.Top = (Height - edit.Height) / 2;
NoNeedChange = false;
}
//if (Height < edit.Height + RectSize * 2 + 2)
//{
// NoNeedChange = true;
// Height = edit.Height + RectSize * 2 + 2;
// edit.Top = (Height - edit.Height) / 2;
// NoNeedChange = false;
//}
if (edit.Top != (Height - edit.Height) / 2 + 1)
{