diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe
index 76714eb3..4bde679a 100644
Binary files a/Bin/net40/SunnyUI.Demo.exe and b/Bin/net40/SunnyUI.Demo.exe differ
diff --git a/SunnyUI.Demo/Forms/FFrames.Designer.cs b/SunnyUI.Demo/Forms/FFrames.Designer.cs
index f73a283e..e98bfa10 100644
--- a/SunnyUI.Demo/Forms/FFrames.Designer.cs
+++ b/SunnyUI.Demo/Forms/FFrames.Designer.cs
@@ -35,6 +35,9 @@
this.btnAHM = new Sunny.UI.UIImageButton();
this.btnHMF = new Sunny.UI.UIImageButton();
this.btnHM = new Sunny.UI.UIImageButton();
+ this.uiLine1 = new Sunny.UI.UILine();
+ this.uiLine2 = new Sunny.UI.UILine();
+ this.uiSymbolButton1 = new Sunny.UI.UISymbolButton();
((System.ComponentModel.ISupportInitialize)(this.btnAM)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.btnAHMF)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.btnHAMF)).BeginInit();
@@ -50,7 +53,7 @@
this.btnAM.Font = new System.Drawing.Font("微软雅黑", 12F);
this.btnAM.Image = global::Sunny.UI.Demo.Properties.Resources.AM;
this.btnAM.ImageHover = global::Sunny.UI.Demo.Properties.Resources.AM1;
- this.btnAM.Location = new System.Drawing.Point(30, 385);
+ this.btnAM.Location = new System.Drawing.Point(30, 234);
this.btnAM.Name = "btnAM";
this.btnAM.Size = new System.Drawing.Size(160, 120);
this.btnAM.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -65,7 +68,7 @@
this.btnAHMF.Font = new System.Drawing.Font("微软雅黑", 12F);
this.btnAHMF.Image = global::Sunny.UI.Demo.Properties.Resources.AHMF;
this.btnAHMF.ImageHover = global::Sunny.UI.Demo.Properties.Resources.AHMF1;
- this.btnAHMF.Location = new System.Drawing.Point(430, 385);
+ this.btnAHMF.Location = new System.Drawing.Point(398, 234);
this.btnAHMF.Name = "btnAHMF";
this.btnAHMF.Size = new System.Drawing.Size(160, 120);
this.btnAHMF.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -80,7 +83,7 @@
this.btnHAMF.Font = new System.Drawing.Font("微软雅黑", 12F);
this.btnHAMF.Image = global::Sunny.UI.Demo.Properties.Resources.HAMF;
this.btnHAMF.ImageHover = global::Sunny.UI.Demo.Properties.Resources.HAMF1;
- this.btnHAMF.Location = new System.Drawing.Point(230, 225);
+ this.btnHAMF.Location = new System.Drawing.Point(582, 90);
this.btnHAMF.Name = "btnHAMF";
this.btnHAMF.Size = new System.Drawing.Size(160, 120);
this.btnHAMF.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -95,7 +98,7 @@
this.btnHAM.Font = new System.Drawing.Font("微软雅黑", 12F);
this.btnHAM.Image = global::Sunny.UI.Demo.Properties.Resources.HAM;
this.btnHAM.ImageHover = global::Sunny.UI.Demo.Properties.Resources.HAM1;
- this.btnHAM.Location = new System.Drawing.Point(30, 225);
+ this.btnHAM.Location = new System.Drawing.Point(398, 90);
this.btnHAM.Name = "btnHAM";
this.btnHAM.Size = new System.Drawing.Size(160, 120);
this.btnHAM.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -110,7 +113,7 @@
this.btnAHM.Font = new System.Drawing.Font("微软雅黑", 12F);
this.btnAHM.Image = global::Sunny.UI.Demo.Properties.Resources.AHM;
this.btnAHM.ImageHover = global::Sunny.UI.Demo.Properties.Resources.AHM1;
- this.btnAHM.Location = new System.Drawing.Point(230, 385);
+ this.btnAHM.Location = new System.Drawing.Point(214, 234);
this.btnAHM.Name = "btnAHM";
this.btnAHM.Size = new System.Drawing.Size(160, 120);
this.btnAHM.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -125,7 +128,7 @@
this.btnHMF.Font = new System.Drawing.Font("微软雅黑", 12F);
this.btnHMF.Image = global::Sunny.UI.Demo.Properties.Resources.HMF;
this.btnHMF.ImageHover = global::Sunny.UI.Demo.Properties.Resources.HMF1;
- this.btnHMF.Location = new System.Drawing.Point(230, 65);
+ this.btnHMF.Location = new System.Drawing.Point(214, 90);
this.btnHMF.Name = "btnHMF";
this.btnHMF.Size = new System.Drawing.Size(160, 120);
this.btnHMF.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -140,7 +143,7 @@
this.btnHM.Font = new System.Drawing.Font("微软雅黑", 12F);
this.btnHM.Image = global::Sunny.UI.Demo.Properties.Resources.HM;
this.btnHM.ImageHover = global::Sunny.UI.Demo.Properties.Resources.HM1;
- this.btnHM.Location = new System.Drawing.Point(30, 65);
+ this.btnHM.Location = new System.Drawing.Point(30, 90);
this.btnHM.Name = "btnHM";
this.btnHM.Size = new System.Drawing.Size(160, 120);
this.btnHM.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -150,11 +153,52 @@
this.btnHM.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.btnHM.Click += new System.EventHandler(this.btnHM_Click);
//
+ // uiLine1
+ //
+ this.uiLine1.Font = new System.Drawing.Font("微软雅黑", 12F);
+ this.uiLine1.LineDashStyle = Sunny.UI.UILineDashStyle.None;
+ this.uiLine1.Location = new System.Drawing.Point(30, 55);
+ this.uiLine1.MinimumSize = new System.Drawing.Size(16, 16);
+ this.uiLine1.Name = "uiLine1";
+ this.uiLine1.Size = new System.Drawing.Size(712, 20);
+ this.uiLine1.TabIndex = 78;
+ this.uiLine1.Text = "内置模板";
+ this.uiLine1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // uiLine2
+ //
+ this.uiLine2.Font = new System.Drawing.Font("微软雅黑", 12F);
+ this.uiLine2.LineDashStyle = Sunny.UI.UILineDashStyle.None;
+ this.uiLine2.Location = new System.Drawing.Point(30, 379);
+ this.uiLine2.MinimumSize = new System.Drawing.Size(16, 16);
+ this.uiLine2.Name = "uiLine2";
+ this.uiLine2.Size = new System.Drawing.Size(712, 20);
+ this.uiLine2.TabIndex = 79;
+ this.uiLine2.Text = "自定义模板";
+ this.uiLine2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // uiSymbolButton1
+ //
+ this.uiSymbolButton1.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.uiSymbolButton1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiSymbolButton1.Location = new System.Drawing.Point(30, 417);
+ this.uiSymbolButton1.MinimumSize = new System.Drawing.Size(1, 1);
+ this.uiSymbolButton1.Name = "uiSymbolButton1";
+ this.uiSymbolButton1.Size = new System.Drawing.Size(160, 120);
+ this.uiSymbolButton1.Symbol = 110;
+ this.uiSymbolButton1.SymbolSize = 120;
+ this.uiSymbolButton1.TabIndex = 80;
+ this.uiSymbolButton1.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiSymbolButton1.Click += new System.EventHandler(this.uiSymbolButton1_Click);
+ //
// FFrames
//
this.AllowShowTitle = true;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(892, 627);
+ this.Controls.Add(this.uiSymbolButton1);
+ this.Controls.Add(this.uiLine2);
+ this.Controls.Add(this.uiLine1);
this.Controls.Add(this.btnAM);
this.Controls.Add(this.btnAHMF);
this.Controls.Add(this.btnHAMF);
@@ -188,5 +232,8 @@
private UIImageButton btnAHM;
private UIImageButton btnHMF;
private UIImageButton btnHM;
+ private UILine uiLine1;
+ private UILine uiLine2;
+ private UISymbolButton uiSymbolButton1;
}
}
\ No newline at end of file
diff --git a/SunnyUI.Demo/Forms/FFrames.cs b/SunnyUI.Demo/Forms/FFrames.cs
index af5323ce..b68522e5 100644
--- a/SunnyUI.Demo/Forms/FFrames.cs
+++ b/SunnyUI.Demo/Forms/FFrames.cs
@@ -50,5 +50,12 @@ namespace Sunny.UI.Demo
{
ShowFrame(new FAsideHeaderMainFooter());
}
+
+ private void uiSymbolButton1_Click(object sender, System.EventArgs e)
+ {
+ FCustomMain main = new FCustomMain();
+ main.ShowDialog();
+ main.Dispose();
+ }
}
}
\ No newline at end of file
diff --git a/SunnyUI.Demo/Forms/Frames/FCustomMain.Designer.cs b/SunnyUI.Demo/Forms/Frames/FCustomMain.Designer.cs
new file mode 100644
index 00000000..24d50f29
--- /dev/null
+++ b/SunnyUI.Demo/Forms/Frames/FCustomMain.Designer.cs
@@ -0,0 +1,154 @@
+namespace Sunny.UI.Demo
+{
+ partial class FCustomMain
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.uiPanel1 = new Sunny.UI.UIPanel();
+ this.uiButton3 = new Sunny.UI.UIButton();
+ this.uiButton2 = new Sunny.UI.UIButton();
+ this.uiButton1 = new Sunny.UI.UIButton();
+ this.uiLogo1 = new Sunny.UI.UILogo();
+ this.uiTabControl1 = new Sunny.UI.UITabControl();
+ this.uiPanel1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // uiPanel1
+ //
+ this.uiPanel1.Controls.Add(this.uiButton3);
+ this.uiPanel1.Controls.Add(this.uiButton2);
+ this.uiPanel1.Controls.Add(this.uiButton1);
+ this.uiPanel1.Controls.Add(this.uiLogo1);
+ this.uiPanel1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.uiPanel1.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
+ this.uiPanel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiPanel1.Location = new System.Drawing.Point(1, 35);
+ this.uiPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.uiPanel1.MinimumSize = new System.Drawing.Size(1, 1);
+ this.uiPanel1.Name = "uiPanel1";
+ this.uiPanel1.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
+ this.uiPanel1.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom;
+ this.uiPanel1.Size = new System.Drawing.Size(905, 112);
+ this.uiPanel1.TabIndex = 0;
+ this.uiPanel1.Text = null;
+ this.uiPanel1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // uiButton3
+ //
+ this.uiButton3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.uiButton3.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.uiButton3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton3.Location = new System.Drawing.Point(771, 71);
+ this.uiButton3.MinimumSize = new System.Drawing.Size(1, 1);
+ this.uiButton3.Name = "uiButton3";
+ this.uiButton3.Size = new System.Drawing.Size(100, 35);
+ this.uiButton3.TabIndex = 4;
+ this.uiButton3.Text = "uiButton3";
+ this.uiButton3.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton3.Click += new System.EventHandler(this.uiButton3_Click);
+ //
+ // uiButton2
+ //
+ this.uiButton2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.uiButton2.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.uiButton2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton2.Location = new System.Drawing.Point(654, 71);
+ this.uiButton2.MinimumSize = new System.Drawing.Size(1, 1);
+ this.uiButton2.Name = "uiButton2";
+ this.uiButton2.Size = new System.Drawing.Size(100, 35);
+ this.uiButton2.TabIndex = 3;
+ this.uiButton2.Text = "uiButton2";
+ this.uiButton2.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton2.Click += new System.EventHandler(this.uiButton2_Click);
+ //
+ // uiButton1
+ //
+ this.uiButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.uiButton1.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.uiButton1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton1.Location = new System.Drawing.Point(537, 71);
+ this.uiButton1.MinimumSize = new System.Drawing.Size(1, 1);
+ this.uiButton1.Name = "uiButton1";
+ this.uiButton1.Size = new System.Drawing.Size(100, 35);
+ this.uiButton1.TabIndex = 2;
+ this.uiButton1.Text = "uiButton1";
+ this.uiButton1.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton1.Click += new System.EventHandler(this.uiButton1_Click);
+ //
+ // uiLogo1
+ //
+ this.uiLogo1.Font = new System.Drawing.Font("微软雅黑", 12F);
+ this.uiLogo1.Location = new System.Drawing.Point(5, 16);
+ this.uiLogo1.MaximumSize = new System.Drawing.Size(300, 80);
+ this.uiLogo1.MinimumSize = new System.Drawing.Size(300, 80);
+ this.uiLogo1.Name = "uiLogo1";
+ this.uiLogo1.Size = new System.Drawing.Size(300, 80);
+ this.uiLogo1.TabIndex = 1;
+ this.uiLogo1.Text = "uiLogo1";
+ //
+ // uiTabControl1
+ //
+ this.uiTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.uiTabControl1.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed;
+ this.uiTabControl1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiTabControl1.ItemSize = new System.Drawing.Size(150, 40);
+ this.uiTabControl1.Location = new System.Drawing.Point(1, 147);
+ this.uiTabControl1.MainPage = "";
+ this.uiTabControl1.Name = "uiTabControl1";
+ this.uiTabControl1.SelectedIndex = 0;
+ this.uiTabControl1.ShowCloseButton = true;
+ this.uiTabControl1.Size = new System.Drawing.Size(905, 419);
+ this.uiTabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
+ this.uiTabControl1.TabIndex = 1;
+ this.uiTabControl1.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ //
+ // FCustomMain
+ //
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+ this.ClientSize = new System.Drawing.Size(907, 567);
+ this.Controls.Add(this.uiTabControl1);
+ this.Controls.Add(this.uiPanel1);
+ this.Name = "FCustomMain";
+ this.Padding = new System.Windows.Forms.Padding(1, 35, 1, 1);
+ this.ShowRadius = false;
+ this.Text = "自定义框架模板(可关闭页面)";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.uiPanel1.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private UIPanel uiPanel1;
+ private UILogo uiLogo1;
+ private UITabControl uiTabControl1;
+ private UIButton uiButton3;
+ private UIButton uiButton2;
+ private UIButton uiButton1;
+ }
+}
\ No newline at end of file
diff --git a/SunnyUI.Demo/Forms/Frames/FCustomMain.cs b/SunnyUI.Demo/Forms/Frames/FCustomMain.cs
new file mode 100644
index 00000000..79b49542
--- /dev/null
+++ b/SunnyUI.Demo/Forms/Frames/FCustomMain.cs
@@ -0,0 +1,50 @@
+namespace Sunny.UI.Demo
+{
+ public partial class FCustomMain : UIForm
+ {
+ public FCustomMain()
+ {
+ InitializeComponent();
+
+ //新建一个窗体,改继承Form为UIForm
+ //窗体上只要放一个UITabControl,并关联到UIForm,这样多页面框架就已经打好了,其余的可以自由发挥
+ MainTabControl = uiTabControl1;
+
+ //有三个UIPage,分别为:
+ //FPage1,其属性PageIndex为1001
+ //FPage2,其属性PageIndex为1002
+ //FPage3,其属性PageIndex为1003
+
+ //设置FTitlePage1为主页面,不能被关闭
+ var mainPage = new FPage1();
+ MainTabControl.MainPage = mainPage.Text = "主页";
+ AddPage(mainPage);
+ }
+
+ private void uiButton1_Click(object sender, System.EventArgs e)
+ {
+ //因为主页面已经加进去了,直接选取即可
+ SelectPage(1001);
+ }
+
+ private void uiButton2_Click(object sender, System.EventArgs e)
+ {
+ if (!ExistPage(1002))
+ {
+ AddPage(new FPage2());
+ }
+
+ SelectPage(1002);
+ }
+
+ private void uiButton3_Click(object sender, System.EventArgs e)
+ {
+ if (!ExistPage(1003))
+ {
+ AddPage(new FPage3());
+ }
+
+ SelectPage(1003);
+ }
+ }
+}
diff --git a/SunnyUI.Demo/Forms/Frames/FCustomMain.resx b/SunnyUI.Demo/Forms/Frames/FCustomMain.resx
new file mode 100644
index 00000000..1af7de15
--- /dev/null
+++ b/SunnyUI.Demo/Forms/Frames/FCustomMain.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/SunnyUI.Demo/Forms/Pages/FPage1.Designer.cs b/SunnyUI.Demo/Forms/Pages/FPage1.Designer.cs
index ece8599b..0e813e72 100644
--- a/SunnyUI.Demo/Forms/Pages/FPage1.Designer.cs
+++ b/SunnyUI.Demo/Forms/Pages/FPage1.Designer.cs
@@ -37,6 +37,7 @@
this.uiSymbolLabel1.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiSymbolLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
this.uiSymbolLabel1.Location = new System.Drawing.Point(0, 0);
+ this.uiSymbolLabel1.MinimumSize = new System.Drawing.Size(1, 1);
this.uiSymbolLabel1.Name = "uiSymbolLabel1";
this.uiSymbolLabel1.Padding = new System.Windows.Forms.Padding(68, 0, 0, 0);
this.uiSymbolLabel1.Size = new System.Drawing.Size(800, 450);
@@ -50,11 +51,11 @@
//
// FPage1
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(800, 450);
this.Controls.Add(this.uiSymbolLabel1);
this.Name = "FPage1";
+ this.PageIndex = 1001;
this.Text = "FPage1";
this.ResumeLayout(false);
diff --git a/SunnyUI.Demo/Forms/Pages/FPage2.Designer.cs b/SunnyUI.Demo/Forms/Pages/FPage2.Designer.cs
index f734864e..d9dec6ce 100644
--- a/SunnyUI.Demo/Forms/Pages/FPage2.Designer.cs
+++ b/SunnyUI.Demo/Forms/Pages/FPage2.Designer.cs
@@ -37,6 +37,7 @@
this.uiSymbolLabel1.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiSymbolLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(190)))), ((int)(((byte)(40)))));
this.uiSymbolLabel1.Location = new System.Drawing.Point(0, 0);
+ this.uiSymbolLabel1.MinimumSize = new System.Drawing.Size(1, 1);
this.uiSymbolLabel1.Name = "uiSymbolLabel1";
this.uiSymbolLabel1.Padding = new System.Windows.Forms.Padding(68, 0, 0, 0);
this.uiSymbolLabel1.Size = new System.Drawing.Size(800, 450);
@@ -50,11 +51,11 @@
//
// FPage2
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(800, 450);
this.Controls.Add(this.uiSymbolLabel1);
this.Name = "FPage2";
+ this.PageIndex = 1002;
this.Text = "FPage2";
this.ResumeLayout(false);
diff --git a/SunnyUI.Demo/Forms/Pages/FPage3.Designer.cs b/SunnyUI.Demo/Forms/Pages/FPage3.Designer.cs
index 554a60bf..0debc7c3 100644
--- a/SunnyUI.Demo/Forms/Pages/FPage3.Designer.cs
+++ b/SunnyUI.Demo/Forms/Pages/FPage3.Designer.cs
@@ -37,6 +37,7 @@
this.uiSymbolLabel1.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiSymbolLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(155)))), ((int)(((byte)(40)))));
this.uiSymbolLabel1.Location = new System.Drawing.Point(0, 0);
+ this.uiSymbolLabel1.MinimumSize = new System.Drawing.Size(1, 1);
this.uiSymbolLabel1.Name = "uiSymbolLabel1";
this.uiSymbolLabel1.Padding = new System.Windows.Forms.Padding(68, 0, 0, 0);
this.uiSymbolLabel1.Size = new System.Drawing.Size(800, 450);
@@ -50,11 +51,11 @@
//
// FPage3
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(800, 450);
this.Controls.Add(this.uiSymbolLabel1);
this.Name = "FPage3";
+ this.PageIndex = 1003;
this.Text = "FPage3";
this.ResumeLayout(false);
diff --git a/SunnyUI.Demo/Forms/Pages/FTitlePage1.Designer.cs b/SunnyUI.Demo/Forms/Pages/FTitlePage1.Designer.cs
index 3a03b8c3..2247192c 100644
--- a/SunnyUI.Demo/Forms/Pages/FTitlePage1.Designer.cs
+++ b/SunnyUI.Demo/Forms/Pages/FTitlePage1.Designer.cs
@@ -57,8 +57,9 @@
this.Controls.Add(this.uiSymbolLabel1);
this.Name = "FTitlePage1";
this.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0);
+ this.PageIndex = 1001;
this.ShowTitle = true;
- this.Text = "FPage1";
+ this.Text = "FPage2";
this.ResumeLayout(false);
}
diff --git a/SunnyUI.Demo/Forms/Pages/FTitlePage2.Designer.cs b/SunnyUI.Demo/Forms/Pages/FTitlePage2.Designer.cs
index 99c3fd00..e9dcb250 100644
--- a/SunnyUI.Demo/Forms/Pages/FTitlePage2.Designer.cs
+++ b/SunnyUI.Demo/Forms/Pages/FTitlePage2.Designer.cs
@@ -57,6 +57,7 @@
this.Controls.Add(this.uiSymbolLabel1);
this.Name = "FTitlePage2";
this.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0);
+ this.PageIndex = 1002;
this.ShowTitle = true;
this.Text = "FPage2";
this.ResumeLayout(false);
diff --git a/SunnyUI.Demo/Forms/Pages/FTitlePage3.Designer.cs b/SunnyUI.Demo/Forms/Pages/FTitlePage3.Designer.cs
index 50f3e457..6fa3ee97 100644
--- a/SunnyUI.Demo/Forms/Pages/FTitlePage3.Designer.cs
+++ b/SunnyUI.Demo/Forms/Pages/FTitlePage3.Designer.cs
@@ -57,6 +57,7 @@
this.Controls.Add(this.uiSymbolLabel1);
this.Name = "FTitlePage3";
this.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0);
+ this.PageIndex = 1003;
this.ShowTitle = true;
this.Text = "FPage3";
this.ResumeLayout(false);
diff --git a/SunnyUI.Demo/SunnyUI.Demo.csproj b/SunnyUI.Demo/SunnyUI.Demo.csproj
index 701a2ae1..aa9f5c67 100644
--- a/SunnyUI.Demo/SunnyUI.Demo.csproj
+++ b/SunnyUI.Demo/SunnyUI.Demo.csproj
@@ -131,6 +131,12 @@
FSplitContainer.cs
+
+ Form
+
+
+ FCustomMain.cs
+
Form
@@ -410,6 +416,9 @@
FSplitContainer.cs
+
+ FCustomMain.cs
+
FLight.cs