diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll
index f46c9347..9a2ecde2 100644
Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ
diff --git a/Bin/net5.0-windows/SunnyUI.dll b/Bin/net5.0-windows/SunnyUI.dll
index 18fde9db..2d250cf1 100644
Binary files a/Bin/net5.0-windows/SunnyUI.dll and b/Bin/net5.0-windows/SunnyUI.dll differ
diff --git a/Bin/net5.0-windows/ref/SunnyUI.dll b/Bin/net5.0-windows/ref/SunnyUI.dll
index 0ce64b45..f350a093 100644
Binary files a/Bin/net5.0-windows/ref/SunnyUI.dll and b/Bin/net5.0-windows/ref/SunnyUI.dll differ
diff --git a/Bin/netcoreapp3.1/SunnyUI.dll b/Bin/netcoreapp3.1/SunnyUI.dll
index 2b81d136..219f4475 100644
Binary files a/Bin/netcoreapp3.1/SunnyUI.dll and b/Bin/netcoreapp3.1/SunnyUI.dll differ
diff --git a/SunnyUI.Demo/Controls/FButton.resx b/SunnyUI.Demo/Controls/FButton.resx
index eaa39c0c..3ea6cbca 100644
--- a/SunnyUI.Demo/Controls/FButton.resx
+++ b/SunnyUI.Demo/Controls/FButton.resx
@@ -120,9 +120,6 @@
17, 17
-
- 17, 17
-
52
diff --git a/SunnyUI/Pages/UITitlePage.Designer.cs b/SunnyUI/Pages/UITitlePage.Designer.cs
index 72c9a077..3bd1c611 100644
--- a/SunnyUI/Pages/UITitlePage.Designer.cs
+++ b/SunnyUI/Pages/UITitlePage.Designer.cs
@@ -35,13 +35,14 @@
// PageTitle
//
this.PageTitle.Dock = System.Windows.Forms.DockStyle.Top;
- this.PageTitle.Font = new System.Drawing.Font("微软雅黑", 12F);
+ this.PageTitle.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
this.PageTitle.Location = new System.Drawing.Point(0, 0);
+ this.PageTitle.MinimumSize = new System.Drawing.Size(1, 1);
this.PageTitle.Name = "PageTitle";
this.PageTitle.Padding = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.PageTitle.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
this.PageTitle.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
- this.PageTitle.Size = new System.Drawing.Size(800, 35);
+ this.PageTitle.Size = new System.Drawing.Size(993, 35);
this.PageTitle.Symbol = 0;
this.PageTitle.SymbolSize = 24;
this.PageTitle.TabIndex = 0;
@@ -51,24 +52,26 @@
// PagePanel
//
this.PagePanel.Dock = System.Windows.Forms.DockStyle.Fill;
- this.PagePanel.Font = new System.Drawing.Font("微软雅黑", 12F);
+ this.PagePanel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
this.PagePanel.Location = new System.Drawing.Point(0, 35);
this.PagePanel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.PagePanel.MinimumSize = new System.Drawing.Size(1, 1);
this.PagePanel.Name = "PagePanel";
this.PagePanel.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
this.PagePanel.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
- this.PagePanel.Size = new System.Drawing.Size(800, 415);
+ this.PagePanel.Size = new System.Drawing.Size(993, 239);
this.PagePanel.TabIndex = 1;
this.PagePanel.Text = null;
//
// UITitlePage
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.ClientSize = new System.Drawing.Size(800, 450);
+ this.ClientSize = new System.Drawing.Size(993, 274);
this.Controls.Add(this.PagePanel);
this.Controls.Add(this.PageTitle);
this.Name = "UITitlePage";
this.Text = "UITitlePage";
+ this.Shown += new System.EventHandler(this.UITitlePage_Shown);
this.ResumeLayout(false);
}
diff --git a/SunnyUI/Pages/UITitlePage.cs b/SunnyUI/Pages/UITitlePage.cs
index 76c41023..8861b085 100644
--- a/SunnyUI/Pages/UITitlePage.cs
+++ b/SunnyUI/Pages/UITitlePage.cs
@@ -48,6 +48,16 @@ namespace Sunny.UI
}
}
+ private bool showTitle = true;
+
+ [Description("显示标题"), Category("SunnyUI")]
+ [DefaultValue(true)]
+ public bool ShowTitle
+ {
+ get => showTitle;
+ set => showTitle = value;
+ }
+
protected override void SymbolChange()
{
base.SymbolChange();
@@ -159,5 +169,13 @@ namespace Sunny.UI
}
}
}
+
+ private void UITitlePage_Shown(object sender, System.EventArgs e)
+ {
+ if (!IsDesignMode)
+ {
+ PageTitle.Visible = showTitle;
+ }
+ }
}
}
\ No newline at end of file
diff --git a/SunnyUI/Pages/UITitlePage.resx b/SunnyUI/Pages/UITitlePage.resx
index 1af7de15..f298a7be 100644
--- a/SunnyUI/Pages/UITitlePage.resx
+++ b/SunnyUI/Pages/UITitlePage.resx
@@ -1,64 +1,4 @@
-
-
-
+