diff --git a/Bin/SunnyUI.dll b/Bin/SunnyUI.dll index ce0a0b54..263c45c6 100644 Binary files a/Bin/SunnyUI.dll and b/Bin/SunnyUI.dll differ diff --git a/Bin/SunnyUI.pdb b/Bin/SunnyUI.pdb index 35958b06..2ccffad7 100644 Binary files a/Bin/SunnyUI.pdb and b/Bin/SunnyUI.pdb differ diff --git a/README.md b/README.md index 8bc78ab6..88a3d7cb 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ #### 介绍 - SunnyUI.Net, 基于 C# .Net WinForm 开源控件库、工具类库、扩展类库、多页面开发框架 +- 源码编译环境:VS2019 +- 动态库应用环境:VS2010,.Net Framework 4.0及以上 #### 软件框架 ![思维导图](https://images.gitee.com/uploads/images/2020/0518/223455_88a12732_416720.png "中心主题.png") diff --git a/SunnyUI.Demo/Bin/SunnyUI.Demo.exe b/SunnyUI.Demo/Bin/SunnyUI.Demo.exe index 358c5569..0ccfc3d1 100644 Binary files a/SunnyUI.Demo/Bin/SunnyUI.Demo.exe and b/SunnyUI.Demo/Bin/SunnyUI.Demo.exe differ diff --git a/SunnyUI.Demo/Bin/SunnyUI.dll b/SunnyUI.Demo/Bin/SunnyUI.dll index ce0a0b54..263c45c6 100644 Binary files a/SunnyUI.Demo/Bin/SunnyUI.dll and b/SunnyUI.Demo/Bin/SunnyUI.dll differ diff --git a/SunnyUI.Demo/Forms/FDialogs.cs b/SunnyUI.Demo/Forms/FDialogs.cs index 9b9d1c86..20ee1d17 100644 --- a/SunnyUI.Demo/Forms/FDialogs.cs +++ b/SunnyUI.Demo/Forms/FDialogs.cs @@ -1,6 +1,6 @@ -using System; +using Sunny.UI.Demo.Forms; +using System; using System.Collections.Generic; -using Sunny.UI.Demo.Forms; namespace Sunny.UI.Demo { @@ -15,11 +15,11 @@ namespace Sunny.UI.Demo { if (this.ShowAskDialog("确认信息提示框")) { - this.ShowInfoDialog("您点击了确定按钮"); + UIMessageTip.ShowOk("您点击了确定按钮"); } else { - this.ShowErrorDialog("您点击了取消按钮"); + UIMessageTip.ShowError("您点击了取消按钮"); } } diff --git a/SunnyUI.Demo/Forms/FLogin.Designer.cs b/SunnyUI.Demo/Forms/FLogin.Designer.cs index c9754aa3..1efa3009 100644 --- a/SunnyUI.Demo/Forms/FLogin.Designer.cs +++ b/SunnyUI.Demo/Forms/FLogin.Designer.cs @@ -41,7 +41,7 @@ // this.pictureBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(171)))), ((int)(((byte)(208)))), ((int)(((byte)(250))))); this.pictureBox1.Image = global::Sunny.UI.Demo.Properties.Resources.SunnyLogin; - this.pictureBox1.Location = new System.Drawing.Point(183, 212); + this.pictureBox1.Location = new System.Drawing.Point(180, 208); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(71, 71); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; diff --git a/SunnyUI/Forms/UIFormHelper.cs b/SunnyUI/Forms/UIFormHelper.cs index f1a61cb8..1cc1a6c7 100644 --- a/SunnyUI/Forms/UIFormHelper.cs +++ b/SunnyUI/Forms/UIFormHelper.cs @@ -379,12 +379,8 @@ namespace Sunny.UI frm.Style = style; frm.SetItems(items); frm.SelectedIndex = selectIndex; - if (title.IsValid()) - { - frm.Title = title; - } - - frm.Description = description; + if (title.IsValid()) frm.Title = title; + if (description.IsValid()) frm.Description = description; frm.ShowDialog(); bool result = frm.IsOK; diff --git a/SunnyUI/Forms/UIMessageForm.Designer.cs b/SunnyUI/Forms/UIMessageForm.Designer.cs index ae856de3..50f001af 100644 --- a/SunnyUI/Forms/UIMessageForm.Designer.cs +++ b/SunnyUI/Forms/UIMessageForm.Designer.cs @@ -97,7 +97,6 @@ this.ShowIcon = false; this.ShowInTaskbar = false; this.Text = "UIMsgBox"; - this.TopMost = true; this.ResumeLayout(false); } diff --git a/SunnyUI/Forms/UIMessageForm.cs b/SunnyUI/Forms/UIMessageForm.cs index df5a7c37..324f47df 100644 --- a/SunnyUI/Forms/UIMessageForm.cs +++ b/SunnyUI/Forms/UIMessageForm.cs @@ -120,8 +120,6 @@ namespace Sunny.UI lbMsg.BackColor = BackColor; lbMsg.SelectionColor = RectColor; } - - Invalidate(); } private void btnOK_MouseEnter(object sender, EventArgs e) diff --git a/Updates.txt b/Updates.txt index af1e2d50..3a124854 100644 --- a/Updates.txt +++ b/Updates.txt @@ -2,6 +2,7 @@ 2020.06.21 + UILoginForm¼ͼƬ +* UIMessageFormDemoϢڵˢ˸Bug 2020.06.20 + UILoginFormӵ¼