diff --git a/SunnyUI/Forms/UIForm.cs b/SunnyUI/Forms/UIForm.cs
index ba8843f5..51d8e3d6 100644
--- a/SunnyUI/Forms/UIForm.cs
+++ b/SunnyUI/Forms/UIForm.cs
@@ -1379,10 +1379,7 @@ namespace Sunny.UI
{
if (!DesignMode && UIStyles.Style.IsValid())
{
- Style = UIStyles.Style;
- this.SuspendLayout();
- UIStyleHelper.SetChildUIStyle(this, UIStyles.Style);
- this.ResumeLayout();
+ SetInheritedStyle(UIStyles.Style);
}
}
diff --git a/SunnyUI/Forms/UIMessageForm.Designer.cs b/SunnyUI/Forms/UIMessageForm.Designer.cs
index b7c97a49..2990bc27 100644
--- a/SunnyUI/Forms/UIMessageForm.Designer.cs
+++ b/SunnyUI/Forms/UIMessageForm.Designer.cs
@@ -43,13 +43,11 @@
btnCancel.MinimumSize = new System.Drawing.Size(1, 1);
btnCancel.Name = "btnCancel";
btnCancel.Size = new System.Drawing.Size(224, 48);
+ btnCancel.Style = UIStyle.Custom;
btnCancel.TabIndex = 6;
btnCancel.Text = "取消";
- btnCancel.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
btnCancel.TipsText = null;
btnCancel.Click += btnCancel_Click;
- btnCancel.MouseEnter += btnOK_MouseEnter;
- btnCancel.MouseLeave += btnOK_MouseLeave;
//
// btnOK
//
@@ -61,13 +59,11 @@
btnOK.MinimumSize = new System.Drawing.Size(1, 1);
btnOK.Name = "btnOK";
btnOK.Size = new System.Drawing.Size(223, 48);
+ btnOK.Style = UIStyle.Custom;
btnOK.TabIndex = 5;
btnOK.Text = "确定";
- btnOK.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
btnOK.TipsText = null;
btnOK.Click += btnOK_Click;
- btnOK.MouseEnter += btnOK_MouseEnter;
- btnOK.MouseLeave += btnOK_MouseLeave;
//
// lbMsg
//
@@ -84,6 +80,7 @@
lbMsg.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
lbMsg.ShowText = false;
lbMsg.Size = new System.Drawing.Size(422, 158);
+ lbMsg.Style = UIStyle.Custom;
lbMsg.TabIndex = 7;
lbMsg.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
//
diff --git a/SunnyUI/Forms/UIMessageForm.cs b/SunnyUI/Forms/UIMessageForm.cs
index eb360dde..447edf52 100644
--- a/SunnyUI/Forms/UIMessageForm.cs
+++ b/SunnyUI/Forms/UIMessageForm.cs
@@ -130,6 +130,7 @@ namespace Sunny.UI
if (btnCancel != null)
{
+ btnCancel.SetStyleColor(uiColor);
btnCancel.FillColor = BackColor;
btnCancel.RectColor = Color.FromArgb(36, uiColor.ButtonRectColor);
btnCancel.ForeColor = uiColor.LabelForeColor;
@@ -137,6 +138,7 @@ namespace Sunny.UI
if (btnOK != null)
{
+ btnOK.SetStyleColor(uiColor);
btnOK.FillColor = BackColor;
btnOK.RectColor = Color.FromArgb(36, uiColor.ButtonRectColor);
btnOK.ForeColor = uiColor.LabelForeColor;
@@ -144,6 +146,7 @@ namespace Sunny.UI
if (lbMsg != null)
{
+ lbMsg.SetStyleColor(uiColor);
lbMsg.ForeColor = uiColor.LabelForeColor;
lbMsg.BackColor = uiColor.PlainColor;
lbMsg.FillColor = uiColor.PlainColor;
@@ -154,16 +157,6 @@ namespace Sunny.UI
public UIMessageDialogButtons DefaultButton { get; set; } = UIMessageDialogButtons.Ok;
- private void btnOK_MouseEnter(object sender, EventArgs e)
- {
- //((UIButton)sender).RadiusSides = UICornerRadiusSides.All;
- }
-
- private void btnOK_MouseLeave(object sender, EventArgs e)
- {
- //((UIButton)sender).RadiusSides = UICornerRadiusSides.None;
- }
-
///
/// 显示消息提示窗体
///
diff --git a/SunnyUI/Forms/UIMessageForm.resx b/SunnyUI/Forms/UIMessageForm.resx
index a395bffc..af32865e 100644
--- a/SunnyUI/Forms/UIMessageForm.resx
+++ b/SunnyUI/Forms/UIMessageForm.resx
@@ -18,7 +18,7 @@
System.Resources.ResXResourceReader, System.Windows.Forms, ...
System.Resources.ResXResourceWriter, System.Windows.Forms, ...
this is my long stringthis is a comment
- Blue
+ Blue
[base64 mime encoded serialized .NET Framework object]
diff --git a/SunnyUI/Frames/UIPage.cs b/SunnyUI/Frames/UIPage.cs
index 616484de..8ba39397 100644
--- a/SunnyUI/Frames/UIPage.cs
+++ b/SunnyUI/Frames/UIPage.cs
@@ -292,10 +292,7 @@ namespace Sunny.UI
{
if (!DesignMode && UIStyles.Style.IsValid())
{
- Style = UIStyles.Style;
- this.SuspendLayout();
- UIStyleHelper.SetChildUIStyle(this, UIStyles.Style);
- this.ResumeLayout();
+ SetInheritedStyle(UIStyles.Style);
}
}