diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe index ab85fc9a..cf531e54 100644 Binary files a/Bin/net40/SunnyUI.Demo.exe and b/Bin/net40/SunnyUI.Demo.exe differ diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll index e399c522..ab3b43ac 100644 Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ diff --git a/SunnyUI.Demo/Controls/FTextBox.Designer.cs b/SunnyUI.Demo/Controls/FTextBox.Designer.cs index 6cac4b3c..dcca599d 100644 --- a/SunnyUI.Demo/Controls/FTextBox.Designer.cs +++ b/SunnyUI.Demo/Controls/FTextBox.Designer.cs @@ -204,7 +204,7 @@ namespace Sunny.UI.Demo this.uiDoubleUpDown1.TabIndex = 8; this.uiDoubleUpDown1.Text = "uiDoubleUpDown1"; this.uiDoubleUpDown1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; - this.uiDoubleUpDown1.Value = 0D; + this.uiDoubleUpDown1.Value = 10D; // // uiLabel3 // @@ -298,6 +298,7 @@ namespace Sunny.UI.Demo this.uiIntegerUpDown1.TabIndex = 7; this.uiIntegerUpDown1.Text = "_uiIntegerUpDown1"; this.uiIntegerUpDown1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; + this.uiIntegerUpDown1.Value = 10; // // uiToolTip1 // diff --git a/SunnyUI/Controls/UIDoubleUpDown.cs b/SunnyUI/Controls/UIDoubleUpDown.cs index 7c68eb82..aabeb059 100644 --- a/SunnyUI/Controls/UIDoubleUpDown.cs +++ b/SunnyUI/Controls/UIDoubleUpDown.cs @@ -279,8 +279,8 @@ namespace Sunny.UI pnlColor = pnlValue.FillColor; pnlValue.FillColor = Color.White; edit.TextAlign = HorizontalAlignment.Center; - edit.Text = pnlValue.Text; edit.DecLength = Decimal; + edit.DoubleValue = Value; edit.BringToFront(); edit.Visible = true; edit.Focus(); diff --git a/SunnyUI/Controls/UIEdit.cs b/SunnyUI/Controls/UIEdit.cs index 50cb252a..eb5bf05a 100644 --- a/SunnyUI/Controls/UIEdit.cs +++ b/SunnyUI/Controls/UIEdit.cs @@ -272,7 +272,7 @@ namespace Sunny.UI if (_uiEditType == UITextBox.UIEditType.Double) { mask = DecimalToMask(decLength); - Text = mask; + Text = DoubleValue.ToString(mask); Invalidate(); } } diff --git a/SunnyUI/Controls/UIIntegerUpDown.cs b/SunnyUI/Controls/UIIntegerUpDown.cs index db1741cc..d724f819 100644 --- a/SunnyUI/Controls/UIIntegerUpDown.cs +++ b/SunnyUI/Controls/UIIntegerUpDown.cs @@ -276,7 +276,7 @@ namespace Sunny.UI pnlColor = pnlValue.FillColor; pnlValue.FillColor = Color.White; edit.TextAlign = HorizontalAlignment.Center; - edit.Text = pnlValue.Text; + edit.IntValue = Value; edit.BringToFront(); edit.Visible = true; edit.Focus(); diff --git a/SunnyUI/Font/UIFontImages.cs b/SunnyUI/Font/UIFontImages.cs index b6164730..daeebc97 100644 --- a/SunnyUI/Font/UIFontImages.cs +++ b/SunnyUI/Font/UIFontImages.cs @@ -17,6 +17,7 @@ * 创建日期: 2020-01-01 * * 2020-01-01: V2.2.0 增加文件说明 + * 2022-01-28: V3.1.0 增加搜索框,搜索结果标红显示 ******************************************************************************/ using System; @@ -31,7 +32,7 @@ namespace Sunny.UI /// /// 字体图标编辑器 /// - public partial class UIFontImages : Form, ISymbol + internal partial class UIFontImages : Form, ISymbol { private readonly ConcurrentQueue