diff --git a/Bin/SunnyUI.dll b/Bin/SunnyUI.dll index e222ac60..55dff05b 100644 Binary files a/Bin/SunnyUI.dll and b/Bin/SunnyUI.dll differ diff --git a/Bin/SunnyUI.pdb b/Bin/SunnyUI.pdb index 888438d2..59367695 100644 Binary files a/Bin/SunnyUI.pdb and b/Bin/SunnyUI.pdb differ diff --git a/SunnyUI.Demo/Bin/SunnyUI.Demo.exe b/SunnyUI.Demo/Bin/SunnyUI.Demo.exe index 4bd01913..31e5811d 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 e222ac60..55dff05b 100644 Binary files a/SunnyUI.Demo/Bin/SunnyUI.dll and b/SunnyUI.Demo/Bin/SunnyUI.dll differ diff --git a/SunnyUI.Demo/FMain.Designer.cs b/SunnyUI.Demo/FMain.Designer.cs index 63e7ed49..4e4d0326 100644 --- a/SunnyUI.Demo/FMain.Designer.cs +++ b/SunnyUI.Demo/FMain.Designer.cs @@ -63,10 +63,6 @@ this.Header.Size = new System.Drawing.Size(1024, 110); this.Header.MenuItemClick += new Sunny.UI.UINavBar.OnMenuItemClick(this.Header_MenuItemClick); // - // Main - // - this.Main.Size = new System.Drawing.Size(774, 575); - // // uiLogo1 // this.uiLogo1.Font = new System.Drawing.Font("微软雅黑", 12F); diff --git a/SunnyUI.Demo/Forms/Frames/FAsideHeaderMain.Designer.cs b/SunnyUI.Demo/Forms/Frames/FAsideHeaderMain.Designer.cs index 0eaef188..2f3b8427 100644 --- a/SunnyUI.Demo/Forms/Frames/FAsideHeaderMain.Designer.cs +++ b/SunnyUI.Demo/Forms/Frames/FAsideHeaderMain.Designer.cs @@ -44,11 +44,6 @@ this.Aside.Style = Sunny.UI.UIStyle.Blue; this.Aside.MenuItemClick += new Sunny.UI.UINavMenu.OnMenuItemClick(this.Aside_MenuItemClick); // - // Main - // - this.Main.Size = new System.Drawing.Size(774, 628); - this.Main.Style = Sunny.UI.UIStyle.Blue; - // // FAsideHeaderMain // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); diff --git a/SunnyUI.Demo/Forms/Frames/FAsideHeaderMain.cs b/SunnyUI.Demo/Forms/Frames/FAsideHeaderMain.cs index 5c258516..c58fb58e 100644 --- a/SunnyUI.Demo/Forms/Frames/FAsideHeaderMain.cs +++ b/SunnyUI.Demo/Forms/Frames/FAsideHeaderMain.cs @@ -7,7 +7,7 @@ InitializeComponent(); //设置关联 - Aside.TabControl = Main; + Aside.TabControl = MainTabControl; //增加页面到Main AddPage(new FPage1(), 1001); diff --git a/SunnyUI.Demo/Forms/Frames/FAsideHeaderMainFooter.Designer.cs b/SunnyUI.Demo/Forms/Frames/FAsideHeaderMainFooter.Designer.cs index e9ca9afa..8e8e66c0 100644 --- a/SunnyUI.Demo/Forms/Frames/FAsideHeaderMainFooter.Designer.cs +++ b/SunnyUI.Demo/Forms/Frames/FAsideHeaderMainFooter.Designer.cs @@ -51,10 +51,6 @@ this.Aside.Size = new System.Drawing.Size(250, 685); this.Aside.MenuItemClick += new Sunny.UI.UINavMenu.OnMenuItemClick(this.Aside_MenuItemClick); // - // Main - // - this.Main.Size = new System.Drawing.Size(774, 572); - // // FAsideHeaderMainFooter // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); diff --git a/SunnyUI.Demo/Forms/Frames/FAsideHeaderMainFooter.cs b/SunnyUI.Demo/Forms/Frames/FAsideHeaderMainFooter.cs index 02ab2a7f..57fe51f0 100644 --- a/SunnyUI.Demo/Forms/Frames/FAsideHeaderMainFooter.cs +++ b/SunnyUI.Demo/Forms/Frames/FAsideHeaderMainFooter.cs @@ -7,7 +7,7 @@ InitializeComponent(); //设置关联 - Aside.TabControl = Main; + Aside.TabControl = MainTabControl; //增加页面到Main AddPage(new FPage1(), 1001); diff --git a/SunnyUI.Demo/Forms/Frames/FAsideMain.Designer.cs b/SunnyUI.Demo/Forms/Frames/FAsideMain.Designer.cs index ab4a3309..f7f1a7db 100644 --- a/SunnyUI.Demo/Forms/Frames/FAsideMain.Designer.cs +++ b/SunnyUI.Demo/Forms/Frames/FAsideMain.Designer.cs @@ -36,11 +36,6 @@ this.Aside.Size = new System.Drawing.Size(250, 685); this.Aside.Style = Sunny.UI.UIStyle.Blue; // - // Main - // - this.Main.Size = new System.Drawing.Size(774, 685); - this.Main.Style = Sunny.UI.UIStyle.Blue; - // // FAsideMain // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); diff --git a/SunnyUI.Demo/Forms/Frames/FAsideMain.cs b/SunnyUI.Demo/Forms/Frames/FAsideMain.cs index d4d1e496..0308398d 100644 --- a/SunnyUI.Demo/Forms/Frames/FAsideMain.cs +++ b/SunnyUI.Demo/Forms/Frames/FAsideMain.cs @@ -7,7 +7,7 @@ InitializeComponent(); //设置关联 - Aside.TabControl = Main; + Aside.TabControl = MainTabControl; //增加页面到Main AddPage(new FTitlePage1(), 1001); diff --git a/SunnyUI.Demo/Forms/Frames/FHeaderAsideMain.Designer.cs b/SunnyUI.Demo/Forms/Frames/FHeaderAsideMain.Designer.cs index ab9e25e9..d6347eeb 100644 --- a/SunnyUI.Demo/Forms/Frames/FHeaderAsideMain.Designer.cs +++ b/SunnyUI.Demo/Forms/Frames/FHeaderAsideMain.Designer.cs @@ -44,11 +44,6 @@ this.Header.Size = new System.Drawing.Size(1024, 110); this.Header.Style = Sunny.UI.UIStyle.Blue; // - // Main - // - this.Main.Size = new System.Drawing.Size(774, 575); - this.Main.Style = Sunny.UI.UIStyle.Blue; - // // uiLogo1 // this.uiLogo1.Font = new System.Drawing.Font("微软雅黑", 12F); diff --git a/SunnyUI.Demo/Forms/Frames/FHeaderAsideMain.cs b/SunnyUI.Demo/Forms/Frames/FHeaderAsideMain.cs index e0024758..96cfd4fe 100644 --- a/SunnyUI.Demo/Forms/Frames/FHeaderAsideMain.cs +++ b/SunnyUI.Demo/Forms/Frames/FHeaderAsideMain.cs @@ -7,7 +7,7 @@ InitializeComponent(); //设置关联 - Aside.TabControl = Main; + Aside.TabControl = MainTabControl; //增加页面到Main AddPage(new FTitlePage1(), 1001); diff --git a/SunnyUI.Demo/Forms/Frames/FHeaderAsideMainFooter.Designer.cs b/SunnyUI.Demo/Forms/Frames/FHeaderAsideMainFooter.Designer.cs index 61f23f55..76b9dcfd 100644 --- a/SunnyUI.Demo/Forms/Frames/FHeaderAsideMainFooter.Designer.cs +++ b/SunnyUI.Demo/Forms/Frames/FHeaderAsideMainFooter.Designer.cs @@ -52,11 +52,6 @@ this.Header.Size = new System.Drawing.Size(1024, 110); this.Header.Style = Sunny.UI.UIStyle.Blue; // - // Main - // - this.Main.Size = new System.Drawing.Size(774, 519); - this.Main.Style = Sunny.UI.UIStyle.Blue; - // // uiLogo1 // this.uiLogo1.Font = new System.Drawing.Font("微软雅黑", 12F); diff --git a/SunnyUI.Demo/Forms/Frames/FHeaderAsideMainFooter.cs b/SunnyUI.Demo/Forms/Frames/FHeaderAsideMainFooter.cs index ccec642c..f3e5e058 100644 --- a/SunnyUI.Demo/Forms/Frames/FHeaderAsideMainFooter.cs +++ b/SunnyUI.Demo/Forms/Frames/FHeaderAsideMainFooter.cs @@ -7,7 +7,7 @@ InitializeComponent(); //设置关联 - Aside.TabControl = Main; + Aside.TabControl = MainTabControl; //增加页面到Main AddPage(new FTitlePage1(), 1001); diff --git a/SunnyUI.Demo/Forms/Frames/FHeaderMain.Designer.cs b/SunnyUI.Demo/Forms/Frames/FHeaderMain.Designer.cs index 434bb2fb..d06678a6 100644 --- a/SunnyUI.Demo/Forms/Frames/FHeaderMain.Designer.cs +++ b/SunnyUI.Demo/Forms/Frames/FHeaderMain.Designer.cs @@ -50,11 +50,6 @@ treeNode2, treeNode3}); this.Header.Size = new System.Drawing.Size(1024, 110); - this.Header.TabControl = this.Main; - // - // Main - // - this.Main.Size = new System.Drawing.Size(1024, 575); // // uiLogo1 // diff --git a/SunnyUI.Demo/Forms/Frames/FHeaderMain.cs b/SunnyUI.Demo/Forms/Frames/FHeaderMain.cs index 927e4a2f..2df5c0e9 100644 --- a/SunnyUI.Demo/Forms/Frames/FHeaderMain.cs +++ b/SunnyUI.Demo/Forms/Frames/FHeaderMain.cs @@ -7,7 +7,7 @@ InitializeComponent(); //设置关联 - Header.TabControl = Main; + Header.TabControl = MainTabControl; //增加页面到Main AddPage(new FTitlePage1(), 1001); diff --git a/SunnyUI.Demo/Forms/Frames/FHeaderMainFooter.Designer.cs b/SunnyUI.Demo/Forms/Frames/FHeaderMainFooter.Designer.cs index e59c6989..09cad281 100644 --- a/SunnyUI.Demo/Forms/Frames/FHeaderMainFooter.Designer.cs +++ b/SunnyUI.Demo/Forms/Frames/FHeaderMainFooter.Designer.cs @@ -48,11 +48,6 @@ this.Header.Style = Sunny.UI.UIStyle.Blue; this.Header.MenuItemClick += new Sunny.UI.UINavBar.OnMenuItemClick(this.Header_MenuItemClick); // - // Main - // - this.Main.Size = new System.Drawing.Size(1024, 519); - this.Main.Style = Sunny.UI.UIStyle.Blue; - // // uiLogo1 // this.uiLogo1.Font = new System.Drawing.Font("微软雅黑", 12F); diff --git a/SunnyUI.Demo/Forms/Frames/FHeaderMainFooter.cs b/SunnyUI.Demo/Forms/Frames/FHeaderMainFooter.cs index 4e66a855..e508a71c 100644 --- a/SunnyUI.Demo/Forms/Frames/FHeaderMainFooter.cs +++ b/SunnyUI.Demo/Forms/Frames/FHeaderMainFooter.cs @@ -7,7 +7,7 @@ InitializeComponent(); //设置关联 - Header.TabControl = Main; + Header.TabControl = MainTabControl; //增加页面到Main AddPage(new FTitlePage1(), 1001); diff --git a/SunnyUI/Forms/UIForm.cs b/SunnyUI/Forms/UIForm.cs index 563db7b5..1ef42074 100644 --- a/SunnyUI/Forms/UIForm.cs +++ b/SunnyUI/Forms/UIForm.cs @@ -297,7 +297,7 @@ namespace Sunny.UI /// 圆角矩形的半径 public static void SetFormRoundRectRegion(Form form, int rgnRadius) { - if (form.FormBorderStyle == FormBorderStyle.None) + if (form != null && form.FormBorderStyle == FormBorderStyle.None) { int region = CreateRoundRectRgn(0, 0, form.Width + 1, form.Height + 1, rgnRadius, rgnRadius); SetWindowRgn(form.Handle, region, true); diff --git a/SunnyUI/Frames/UIAsideHeaderMainFooterFrame.Designer.cs b/SunnyUI/Frames/UIAsideHeaderMainFooterFrame.Designer.cs index 5da5fd83..1c822109 100644 --- a/SunnyUI/Frames/UIAsideHeaderMainFooterFrame.Designer.cs +++ b/SunnyUI/Frames/UIAsideHeaderMainFooterFrame.Designer.cs @@ -31,10 +31,6 @@ this.Footer = new Sunny.UI.UIPanel(); this.SuspendLayout(); // - // Main - // - this.Main.Size = new System.Drawing.Size(550, 302); - // // Footer // this.Footer.Dock = System.Windows.Forms.DockStyle.Bottom; @@ -59,7 +55,6 @@ this.Controls.SetChildIndex(this.Aside, 0); this.Controls.SetChildIndex(this.Header, 0); this.Controls.SetChildIndex(this.Footer, 0); - this.Controls.SetChildIndex(this.Main, 0); this.ResumeLayout(false); } diff --git a/SunnyUI/Frames/UIAsideHeaderMainFooterFrame.cs b/SunnyUI/Frames/UIAsideHeaderMainFooterFrame.cs index 6e9b1679..e25e90a5 100644 --- a/SunnyUI/Frames/UIAsideHeaderMainFooterFrame.cs +++ b/SunnyUI/Frames/UIAsideHeaderMainFooterFrame.cs @@ -26,9 +26,15 @@ namespace Sunny.UI public UIAsideHeaderMainFooterFrame() { InitializeComponent(); + Controls.SetChildIndex(MainTabControl, 0); + Header.Parent = this; + Aside.Parent = this; + MainTabControl.Parent = this; + Footer.Parent = this; Header.BringToFront(); Footer.BringToFront(); - Main.BringToFront(); + MainTabControl.BringToFront(); + Aside.TabControl = MainTabControl; } } } \ No newline at end of file diff --git a/SunnyUI/Frames/UIAsideHeaderMainFrame.Designer.cs b/SunnyUI/Frames/UIAsideHeaderMainFrame.Designer.cs index f9a1d1fb..55d963e3 100644 --- a/SunnyUI/Frames/UIAsideHeaderMainFrame.Designer.cs +++ b/SunnyUI/Frames/UIAsideHeaderMainFrame.Designer.cs @@ -34,12 +34,6 @@ // Aside // this.Aside.LineColor = System.Drawing.Color.Black; - this.Aside.TabControl = this.Main; - // - // Main - // - this.Main.Location = new System.Drawing.Point(250, 92); - this.Main.Size = new System.Drawing.Size(550, 358); // // Header // @@ -64,7 +58,6 @@ this.Text = "UIAsideHeaderMainFrame"; this.Controls.SetChildIndex(this.Aside, 0); this.Controls.SetChildIndex(this.Header, 0); - this.Controls.SetChildIndex(this.Main, 0); this.ResumeLayout(false); } diff --git a/SunnyUI/Frames/UIAsideHeaderMainFrame.cs b/SunnyUI/Frames/UIAsideHeaderMainFrame.cs index 39519a42..96a1b184 100644 --- a/SunnyUI/Frames/UIAsideHeaderMainFrame.cs +++ b/SunnyUI/Frames/UIAsideHeaderMainFrame.cs @@ -26,8 +26,13 @@ namespace Sunny.UI public UIAsideHeaderMainFrame() { InitializeComponent(); + Controls.SetChildIndex(MainTabControl, 0); + Header.Parent = this; + Aside.Parent = this; + MainTabControl.Parent = this; Header.BringToFront(); - Main.BringToFront(); + MainTabControl.BringToFront(); + Aside.TabControl = MainTabControl; } } } \ No newline at end of file diff --git a/SunnyUI/Frames/UIAsideMainFrame.Designer.cs b/SunnyUI/Frames/UIAsideMainFrame.Designer.cs index 9361ad1d..9593e926 100644 --- a/SunnyUI/Frames/UIAsideMainFrame.Designer.cs +++ b/SunnyUI/Frames/UIAsideMainFrame.Designer.cs @@ -31,13 +31,6 @@ this.Aside = new Sunny.UI.UINavMenu(); this.SuspendLayout(); // - // Main - // - this.Main.ItemSize = new System.Drawing.Size(0, 1); - this.Main.Location = new System.Drawing.Point(250, 35); - this.Main.Size = new System.Drawing.Size(550, 415); - this.Main.TabVisible = false; - // // Aside // this.Aside.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); @@ -49,7 +42,6 @@ this.Aside.Location = new System.Drawing.Point(0, 35); this.Aside.Name = "Aside"; this.Aside.Size = new System.Drawing.Size(250, 415); - this.Aside.TabControl = this.Main; this.Aside.TabIndex = 1; // // UIAsideMainFrame @@ -61,7 +53,6 @@ this.Name = "UIAsideMainFrame"; this.Text = "UIAsideMainFrame"; this.Controls.SetChildIndex(this.Aside, 0); - this.Controls.SetChildIndex(this.Main, 0); this.ResumeLayout(false); } diff --git a/SunnyUI/Frames/UIAsideMainFrame.cs b/SunnyUI/Frames/UIAsideMainFrame.cs index 890e2961..a114e176 100644 --- a/SunnyUI/Frames/UIAsideMainFrame.cs +++ b/SunnyUI/Frames/UIAsideMainFrame.cs @@ -26,6 +26,11 @@ namespace Sunny.UI public UIAsideMainFrame() { InitializeComponent(); + Controls.SetChildIndex(MainTabControl, 0); + Aside.Parent = this; + MainTabControl.Parent = this; + MainTabControl.BringToFront(); + Aside.TabControl = MainTabControl; } } } \ No newline at end of file diff --git a/SunnyUI/Frames/UIHeaderAsideMainFooterFrame.Designer.cs b/SunnyUI/Frames/UIHeaderAsideMainFooterFrame.Designer.cs index 31af74f8..ea6393b0 100644 --- a/SunnyUI/Frames/UIHeaderAsideMainFooterFrame.Designer.cs +++ b/SunnyUI/Frames/UIHeaderAsideMainFooterFrame.Designer.cs @@ -35,10 +35,6 @@ // this.Aside.LineColor = System.Drawing.Color.Black; // - // Main - // - this.Main.Size = new System.Drawing.Size(550, 249); - // // Footer // this.Footer.Dock = System.Windows.Forms.DockStyle.Bottom; @@ -63,7 +59,6 @@ this.Controls.SetChildIndex(this.Header, 0); this.Controls.SetChildIndex(this.Aside, 0); this.Controls.SetChildIndex(this.Footer, 0); - this.Controls.SetChildIndex(this.Main, 0); this.ResumeLayout(false); } diff --git a/SunnyUI/Frames/UIHeaderAsideMainFooterFrame.cs b/SunnyUI/Frames/UIHeaderAsideMainFooterFrame.cs index 2ce23eac..87fcbbb9 100644 --- a/SunnyUI/Frames/UIHeaderAsideMainFooterFrame.cs +++ b/SunnyUI/Frames/UIHeaderAsideMainFooterFrame.cs @@ -27,9 +27,15 @@ namespace Sunny.UI { InitializeComponent(); + Controls.SetChildIndex(MainTabControl, 0); + Header.Parent = this; + Aside.Parent = this; + MainTabControl.Parent = this; + Footer.Parent = this; Aside.BringToFront(); Footer.BringToFront(); - Main.BringToFront(); + MainTabControl.BringToFront(); + Aside.TabControl = MainTabControl; } } } \ No newline at end of file diff --git a/SunnyUI/Frames/UIHeaderAsideMainFrame.Designer.cs b/SunnyUI/Frames/UIHeaderAsideMainFrame.Designer.cs index 9b6fa615..030fddae 100644 --- a/SunnyUI/Frames/UIHeaderAsideMainFrame.Designer.cs +++ b/SunnyUI/Frames/UIHeaderAsideMainFrame.Designer.cs @@ -36,11 +36,6 @@ this.Header.Location = new System.Drawing.Point(0, 35); this.Header.Size = new System.Drawing.Size(800, 110); // - // Main - // - this.Main.Location = new System.Drawing.Point(250, 145); - this.Main.Size = new System.Drawing.Size(550, 305); - // // Aside // this.Aside.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); @@ -52,7 +47,6 @@ this.Aside.Location = new System.Drawing.Point(0, 145); this.Aside.Name = "Aside"; this.Aside.Size = new System.Drawing.Size(250, 305); - this.Aside.TabControl = this.Main; this.Aside.TabIndex = 2; // // UIHeaderAsideMainFrame @@ -65,7 +59,6 @@ this.Text = "UIHeaderAsideMainFrame"; this.Controls.SetChildIndex(this.Header, 0); this.Controls.SetChildIndex(this.Aside, 0); - this.Controls.SetChildIndex(this.Main, 0); this.ResumeLayout(false); } diff --git a/SunnyUI/Frames/UIHeaderAsideMainFrame.cs b/SunnyUI/Frames/UIHeaderAsideMainFrame.cs index ad41a084..72ec190b 100644 --- a/SunnyUI/Frames/UIHeaderAsideMainFrame.cs +++ b/SunnyUI/Frames/UIHeaderAsideMainFrame.cs @@ -26,8 +26,13 @@ namespace Sunny.UI public UIHeaderAsideMainFrame() { InitializeComponent(); + Controls.SetChildIndex(MainTabControl, 0); + Header.Parent = this; + Aside.Parent = this; + MainTabControl.Parent = this; Aside.BringToFront(); - Main.BringToFront(); + MainTabControl.BringToFront(); + Aside.TabControl = MainTabControl; } } } \ No newline at end of file diff --git a/SunnyUI/Frames/UIHeaderMainFooterFrame.Designer.cs b/SunnyUI/Frames/UIHeaderMainFooterFrame.Designer.cs index c471674d..c80e86b5 100644 --- a/SunnyUI/Frames/UIHeaderMainFooterFrame.Designer.cs +++ b/SunnyUI/Frames/UIHeaderMainFooterFrame.Designer.cs @@ -36,10 +36,6 @@ this.Header.Location = new System.Drawing.Point(0, 35); this.Header.Size = new System.Drawing.Size(800, 110); // - // Main - // - this.Main.Size = new System.Drawing.Size(800, 249); - // // Footer // this.Footer.Dock = System.Windows.Forms.DockStyle.Bottom; @@ -65,7 +61,6 @@ this.Text = "UIHeaderMainFooterFrame"; this.Controls.SetChildIndex(this.Footer, 0); this.Controls.SetChildIndex(this.Header, 0); - this.Controls.SetChildIndex(this.Main, 0); this.ResumeLayout(false); } diff --git a/SunnyUI/Frames/UIHeaderMainFooterFrame.cs b/SunnyUI/Frames/UIHeaderMainFooterFrame.cs index 5cd9faca..faa953ed 100644 --- a/SunnyUI/Frames/UIHeaderMainFooterFrame.cs +++ b/SunnyUI/Frames/UIHeaderMainFooterFrame.cs @@ -26,6 +26,11 @@ namespace Sunny.UI public UIHeaderMainFooterFrame() { InitializeComponent(); + Controls.SetChildIndex(MainTabControl, 0); + Header.Parent = this; + Footer.Parent = this; + MainTabControl.Parent = this; + MainTabControl.BringToFront(); } } } \ No newline at end of file diff --git a/SunnyUI/Frames/UIHeaderMainFrame.Designer.cs b/SunnyUI/Frames/UIHeaderMainFrame.Designer.cs index 32797862..549bd86e 100644 --- a/SunnyUI/Frames/UIHeaderMainFrame.Designer.cs +++ b/SunnyUI/Frames/UIHeaderMainFrame.Designer.cs @@ -31,13 +31,6 @@ this.Header = new Sunny.UI.UINavBar(); this.SuspendLayout(); // - // Main - // - this.Main.ItemSize = new System.Drawing.Size(0, 1); - this.Main.Location = new System.Drawing.Point(1, 145); - this.Main.Size = new System.Drawing.Size(798, 304); - this.Main.TabVisible = false; - // // Header // this.Header.Dock = System.Windows.Forms.DockStyle.Top; @@ -60,7 +53,6 @@ this.Name = "UIHeaderMainFrame"; this.Text = "UIHeaderMainFrame"; this.Controls.SetChildIndex(this.Header, 0); - this.Controls.SetChildIndex(this.Main, 0); this.ResumeLayout(false); } diff --git a/SunnyUI/Frames/UIHeaderMainFrame.cs b/SunnyUI/Frames/UIHeaderMainFrame.cs index 3b6be029..e36b8d14 100644 --- a/SunnyUI/Frames/UIHeaderMainFrame.cs +++ b/SunnyUI/Frames/UIHeaderMainFrame.cs @@ -26,6 +26,10 @@ namespace Sunny.UI public UIHeaderMainFrame() { InitializeComponent(); + Controls.SetChildIndex(MainTabControl, 0); + Header.Parent = this; + MainTabControl.Parent = this; + MainTabControl.BringToFront(); } } } \ No newline at end of file diff --git a/SunnyUI/Frames/UIMainFrame.Designer.cs b/SunnyUI/Frames/UIMainFrame.Designer.cs index 7fdd8e1b..ffc7b244 100644 --- a/SunnyUI/Frames/UIMainFrame.Designer.cs +++ b/SunnyUI/Frames/UIMainFrame.Designer.cs @@ -28,26 +28,26 @@ /// private void InitializeComponent() { - this.Main = new Sunny.UI.UITabControl(); + this.MainContainer = new Sunny.UI.UITabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage(); - this.Main.SuspendLayout(); + this.MainContainer.SuspendLayout(); this.SuspendLayout(); // - // Main + // MainContainer // - this.Main.Controls.Add(this.tabPage1); - this.Main.Controls.Add(this.tabPage2); - this.Main.Dock = System.Windows.Forms.DockStyle.Fill; - this.Main.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed; - this.Main.Font = new System.Drawing.Font("微软雅黑", 12F); - this.Main.ItemSize = new System.Drawing.Size(150, 40); - this.Main.Location = new System.Drawing.Point(0, 35); - this.Main.Name = "Main"; - this.Main.SelectedIndex = 0; - this.Main.Size = new System.Drawing.Size(800, 415); - this.Main.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; - this.Main.TabIndex = 0; + this.MainContainer.Controls.Add(this.tabPage1); + this.MainContainer.Controls.Add(this.tabPage2); + this.MainContainer.Dock = System.Windows.Forms.DockStyle.Fill; + this.MainContainer.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed; + this.MainContainer.Font = new System.Drawing.Font("微软雅黑", 12F); + this.MainContainer.ItemSize = new System.Drawing.Size(150, 40); + this.MainContainer.Location = new System.Drawing.Point(0, 35); + this.MainContainer.Name = "MainContainer"; + this.MainContainer.SelectedIndex = 0; + this.MainContainer.Size = new System.Drawing.Size(800, 415); + this.MainContainer.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; + this.MainContainer.TabIndex = 0; // // tabPage1 // @@ -69,14 +69,12 @@ // // UIMainFrame // - 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.Main); + this.Controls.Add(this.MainContainer); this.Name = "UIMainFrame"; - this.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0); this.Text = "UIMainFrame"; - this.Main.ResumeLayout(false); + this.MainContainer.ResumeLayout(false); this.ResumeLayout(false); } @@ -84,6 +82,6 @@ #endregion private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.TabPage tabPage2; - protected UITabControl Main; + private UITabControl MainContainer; } } \ No newline at end of file diff --git a/SunnyUI/Frames/UIMainFrame.cs b/SunnyUI/Frames/UIMainFrame.cs index fdbd123c..bf7d2f63 100644 --- a/SunnyUI/Frames/UIMainFrame.cs +++ b/SunnyUI/Frames/UIMainFrame.cs @@ -26,25 +26,28 @@ namespace Sunny.UI public UIMainFrame() { InitializeComponent(); - Main.BringToFront(); + MainContainer.TabVisible = false; + MainContainer.BringToFront(); } public UIPage AddPage(UIPage page, int index) { page.PageIndex = index; - Main.AddPage(page); + MainContainer.AddPage(page); return page; } public UIPage AddPage(UIPage page) { - Main.AddPage(page); + MainContainer.AddPage(page); return page; } public void SelectPage(int pageIndex) { - Main.SelectPage(pageIndex); + MainContainer.SelectPage(pageIndex); } + + protected UITabControl MainTabControl => MainContainer; } } \ No newline at end of file diff --git a/Updates.txt b/Updates.txt index aa29b42e..aa28579a 100644 --- a/Updates.txt +++ b/Updates.txt @@ -1,5 +1,12 @@ + ӣ - ɾ * ޸ +2020.05.27 +* UIListBoxϢBug +* ҳMain̳йϵΪPrivate̳кʱɾDesign.csMain + +2020.05.26 +* ҳMainŴ + 2020.05.25 + UITextBoxWatermarkˮӡ + ULocalize.csӶ