升级1.8.1,移除WindowBar控件,PageHeader支持副文本居中

This commit is contained in:
czz_y 2025-01-08 09:07:41 +08:00
parent 1cea0b5615
commit 914cad321c
12 changed files with 28 additions and 386 deletions

View File

@ -13,7 +13,7 @@
<Copyright>Copyright © 2024 czz_y</Copyright> <Copyright>Copyright © 2024 czz_y</Copyright>
<FileVersion>$(Version)</FileVersion> <FileVersion>$(Version)</FileVersion>
<AssemblyVersion>$(Version)</AssemblyVersion> <AssemblyVersion>$(Version)</AssemblyVersion>
<Version>1.8.0</Version> <Version>1.8.1</Version>
<Authors>czz_y</Authors> <Authors>czz_y</Authors>
<Description>基于 Winform UI 框架 AntdUI 设计的 Demo</Description> <Description>基于 Winform UI 框架 AntdUI 设计的 Demo</Description>
<PackageProjectUrl>https://gitee.com/mubaiyanghua/antd-uidemo</PackageProjectUrl> <PackageProjectUrl>https://gitee.com/mubaiyanghua/antd-uidemo</PackageProjectUrl>
@ -30,7 +30,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AntdUI" Version="1.8.0" /> <PackageReference Include="AntdUI" Version="1.8.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLog" Version="5.3.3" /> <PackageReference Include="NLog" Version="5.3.3" />
</ItemGroup> </ItemGroup>

View File

@ -29,7 +29,7 @@
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow));
this.titlebar = new AntdUI.WindowBar(); this.titlebar = new AntdUI.PageHeader();
this.input_search = new AntdUI.Input(); this.input_search = new AntdUI.Input();
this.button_color = new AntdUI.Button(); this.button_color = new AntdUI.Button();
this.buttonSZ = new AntdUI.Button(); this.buttonSZ = new AntdUI.Button();
@ -46,11 +46,12 @@
this.titlebar.DividerShow = true; this.titlebar.DividerShow = true;
this.titlebar.Dock = System.Windows.Forms.DockStyle.Top; this.titlebar.Dock = System.Windows.Forms.DockStyle.Top;
this.titlebar.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.titlebar.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.titlebar.IsMax = false;
this.titlebar.Location = new System.Drawing.Point(6, 0); this.titlebar.Location = new System.Drawing.Point(6, 0);
this.titlebar.Name = "titlebar"; this.titlebar.Name = "titlebar";
this.titlebar.ShowButton = true;
this.titlebar.ShowIcon = true;
this.titlebar.Size = new System.Drawing.Size(1018, 40); this.titlebar.Size = new System.Drawing.Size(1018, 40);
this.titlebar.SubText = "Demo"; this.titlebar.SubText = "Demo 1.8.1";
this.titlebar.TabIndex = 0; this.titlebar.TabIndex = 0;
this.titlebar.Text = "AntdUI"; this.titlebar.Text = "AntdUI";
// //
@ -134,7 +135,7 @@
#endregion #endregion
private AntdUI.WindowBar titlebar; private AntdUI.PageHeader titlebar;
private AntdUI.Menu menu; private AntdUI.Menu menu;
private AntdUI.Button buttonSZ; private AntdUI.Button buttonSZ;
private AntdUI.Button button_color; private AntdUI.Button button_color;

View File

@ -352,9 +352,6 @@ namespace AntdUIDemo
case "Signal": case "Signal":
control = new SignalDemo(); control = new SignalDemo();
break; break;
case "WindowBar":
control = new WindowBarDemo();
break;
default: default:
break; break;
} }

View File

@ -94,8 +94,7 @@ namespace AntdUIDemo.Models
new MenuItems { Text = "ContextMenuStrip 快捷菜单", Tag = "ContextMenuStrip" }, new MenuItems { Text = "ContextMenuStrip 快捷菜单", Tag = "ContextMenuStrip" },
new MenuItems { Text = "Image3D 图片3D", Tag = "Image3D" }, new MenuItems { Text = "Image3D 图片3D", Tag = "Image3D" },
new MenuItems { Text = "PageHeader 页头", Tag= "PageHeader"}, new MenuItems { Text = "PageHeader 页头", Tag= "PageHeader"},
new MenuItems { Text = "Signal 信号", Tag = "Signal" }, new MenuItems { Text = "Signal 信号", Tag = "Signal" }
new MenuItems { Text = "WindowBar 窗口栏", Tag = "WindowBar" }
} }
} }
}; };

View File

@ -4,7 +4,7 @@
<h1>AntdUI Demo</h1> <h1>AntdUI Demo</h1>
本项目基于 `Winform .NET Framework 4.8` 开发,是 [AntdUI](https://gitee.com/antdui/AntdUI) 的 Demo 项目,当前版本 `1.8.0` 本项目基于 `Winform .NET Framework 4.8` 开发,是 [AntdUI](https://gitee.com/antdui/AntdUI) 的 Demo 项目,当前版本 `1.8.1`
</div> </div>

View File

@ -157,15 +157,11 @@
this.menu_inline.Indent = true; this.menu_inline.Indent = true;
menuItem1.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem1.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem1.IconSvg = resources.GetString("menuItem1.IconSvg"); menuItem1.IconSvg = resources.GetString("menuItem1.IconSvg");
menuItem1.PARENTITEM = null;
menuItem2.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); menuItem2.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
menuItem2.PARENTITEM = menuItem1;
menuItem2.Text = "SVG可以变色"; menuItem2.Text = "SVG可以变色";
menuItem3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem3.PARENTITEM = menuItem1;
menuItem3.Text = "如果变不了"; menuItem3.Text = "如果变不了";
menuItem4.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem4.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem4.PARENTITEM = menuItem1;
menuItem4.Text = "调整svg内容"; menuItem4.Text = "调整svg内容";
menuItem1.Sub.Add(menuItem2); menuItem1.Sub.Add(menuItem2);
menuItem1.Sub.Add(menuItem3); menuItem1.Sub.Add(menuItem3);
@ -173,15 +169,11 @@
menuItem1.Text = "SVG图标菜单"; menuItem1.Text = "SVG图标菜单";
menuItem5.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem5.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem5.Icon = global::AntdUIDemo.Properties.Resources.; menuItem5.Icon = global::AntdUIDemo.Properties.Resources.;
menuItem5.PARENTITEM = null;
menuItem6.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem6.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem6.PARENTITEM = menuItem5;
menuItem6.Text = "不能变色"; menuItem6.Text = "不能变色";
menuItem7.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem7.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem7.PARENTITEM = menuItem5;
menuItem7.Text = "不适合使用黑白"; menuItem7.Text = "不适合使用黑白";
menuItem8.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem8.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem8.PARENTITEM = menuItem5;
menuItem8.Text = "子菜单"; menuItem8.Text = "子菜单";
menuItem5.Sub.Add(menuItem6); menuItem5.Sub.Add(menuItem6);
menuItem5.Sub.Add(menuItem7); menuItem5.Sub.Add(menuItem7);
@ -189,15 +181,11 @@
menuItem5.Text = "图片资源菜单"; menuItem5.Text = "图片资源菜单";
menuItem9.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem9.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem9.IconSvg = resources.GetString("menuItem9.IconSvg"); menuItem9.IconSvg = resources.GetString("menuItem9.IconSvg");
menuItem9.PARENTITEM = null;
menuItem10.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); menuItem10.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
menuItem10.PARENTITEM = menuItem9;
menuItem10.Text = "二级菜单"; menuItem10.Text = "二级菜单";
menuItem11.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem11.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem11.PARENTITEM = menuItem9;
menuItem11.Text = "二级菜单"; menuItem11.Text = "二级菜单";
menuItem12.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem12.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem12.PARENTITEM = menuItem9;
menuItem12.Text = "二级菜单"; menuItem12.Text = "二级菜单";
menuItem9.Sub.Add(menuItem10); menuItem9.Sub.Add(menuItem10);
menuItem9.Sub.Add(menuItem11); menuItem9.Sub.Add(menuItem11);
@ -231,15 +219,11 @@
this.menu_vertical.Indent = true; this.menu_vertical.Indent = true;
menuItem13.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem13.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem13.IconSvg = resources.GetString("menuItem13.IconSvg"); menuItem13.IconSvg = resources.GetString("menuItem13.IconSvg");
menuItem13.PARENTITEM = null;
menuItem14.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); menuItem14.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
menuItem14.PARENTITEM = menuItem13;
menuItem14.Text = "SVG可以变色"; menuItem14.Text = "SVG可以变色";
menuItem15.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem15.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem15.PARENTITEM = menuItem13;
menuItem15.Text = "如果变不了"; menuItem15.Text = "如果变不了";
menuItem16.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem16.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem16.PARENTITEM = menuItem13;
menuItem16.Text = "调整svg内容"; menuItem16.Text = "调整svg内容";
menuItem13.Sub.Add(menuItem14); menuItem13.Sub.Add(menuItem14);
menuItem13.Sub.Add(menuItem15); menuItem13.Sub.Add(menuItem15);
@ -247,15 +231,11 @@
menuItem13.Text = "SVG图标菜单"; menuItem13.Text = "SVG图标菜单";
menuItem17.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem17.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem17.Icon = global::AntdUIDemo.Properties.Resources.; menuItem17.Icon = global::AntdUIDemo.Properties.Resources.;
menuItem17.PARENTITEM = null;
menuItem18.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem18.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem18.PARENTITEM = menuItem17;
menuItem18.Text = "不能变色"; menuItem18.Text = "不能变色";
menuItem19.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem19.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem19.PARENTITEM = menuItem17;
menuItem19.Text = "不适合使用黑白"; menuItem19.Text = "不适合使用黑白";
menuItem20.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem20.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem20.PARENTITEM = menuItem17;
menuItem20.Text = "子菜单"; menuItem20.Text = "子菜单";
menuItem17.Sub.Add(menuItem18); menuItem17.Sub.Add(menuItem18);
menuItem17.Sub.Add(menuItem19); menuItem17.Sub.Add(menuItem19);
@ -263,15 +243,11 @@
menuItem17.Text = "图片资源菜单"; menuItem17.Text = "图片资源菜单";
menuItem21.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem21.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem21.IconSvg = resources.GetString("menuItem21.IconSvg"); menuItem21.IconSvg = resources.GetString("menuItem21.IconSvg");
menuItem21.PARENTITEM = null;
menuItem22.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); menuItem22.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
menuItem22.PARENTITEM = menuItem21;
menuItem22.Text = "二级菜单"; menuItem22.Text = "二级菜单";
menuItem23.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem23.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem23.PARENTITEM = menuItem21;
menuItem23.Text = "二级菜单"; menuItem23.Text = "二级菜单";
menuItem24.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem24.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
menuItem24.PARENTITEM = menuItem21;
menuItem24.Text = "二级菜单"; menuItem24.Text = "二级菜单";
menuItem21.Sub.Add(menuItem22); menuItem21.Sub.Add(menuItem22);
menuItem21.Sub.Add(menuItem23); menuItem21.Sub.Add(menuItem23);
@ -305,36 +281,24 @@
this.menu_horizontal.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.menu_horizontal.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.menu_horizontal.Indent = true; this.menu_horizontal.Indent = true;
menuItem25.IconSvg = resources.GetString("menuItem25.IconSvg"); menuItem25.IconSvg = resources.GetString("menuItem25.IconSvg");
menuItem25.PARENTITEM = null;
menuItem26.PARENTITEM = null;
menuItem26.Text = "SVG可以变色"; menuItem26.Text = "SVG可以变色";
menuItem27.PARENTITEM = null;
menuItem27.Text = "如果变不了"; menuItem27.Text = "如果变不了";
menuItem28.PARENTITEM = null;
menuItem28.Text = "调整svg内容"; menuItem28.Text = "调整svg内容";
menuItem25.Sub.Add(menuItem26); menuItem25.Sub.Add(menuItem26);
menuItem25.Sub.Add(menuItem27); menuItem25.Sub.Add(menuItem27);
menuItem25.Sub.Add(menuItem28); menuItem25.Sub.Add(menuItem28);
menuItem25.Text = "SVG图标菜单"; menuItem25.Text = "SVG图标菜单";
menuItem29.Icon = global::AntdUIDemo.Properties.Resources.; menuItem29.Icon = global::AntdUIDemo.Properties.Resources.;
menuItem29.PARENTITEM = null;
menuItem30.PARENTITEM = null;
menuItem30.Text = "不能变色"; menuItem30.Text = "不能变色";
menuItem31.PARENTITEM = null;
menuItem31.Text = "不适合使用黑白"; menuItem31.Text = "不适合使用黑白";
menuItem32.PARENTITEM = null;
menuItem32.Text = "二级菜单"; menuItem32.Text = "二级菜单";
menuItem29.Sub.Add(menuItem30); menuItem29.Sub.Add(menuItem30);
menuItem29.Sub.Add(menuItem31); menuItem29.Sub.Add(menuItem31);
menuItem29.Sub.Add(menuItem32); menuItem29.Sub.Add(menuItem32);
menuItem29.Text = "图片资源菜单"; menuItem29.Text = "图片资源菜单";
menuItem33.IconSvg = resources.GetString("menuItem33.IconSvg"); menuItem33.IconSvg = resources.GetString("menuItem33.IconSvg");
menuItem33.PARENTITEM = null;
menuItem34.PARENTITEM = null;
menuItem34.Text = "二级菜单"; menuItem34.Text = "二级菜单";
menuItem35.PARENTITEM = null;
menuItem35.Text = "二级菜单"; menuItem35.Text = "二级菜单";
menuItem36.PARENTITEM = null;
menuItem36.Text = "二级菜单"; menuItem36.Text = "二级菜单";
menuItem33.Sub.Add(menuItem34); menuItem33.Sub.Add(menuItem34);
menuItem33.Sub.Add(menuItem35); menuItem33.Sub.Add(menuItem35);
@ -448,6 +412,7 @@
this.colorPicker_backactive.Size = new System.Drawing.Size(121, 34); this.colorPicker_backactive.Size = new System.Drawing.Size(121, 34);
this.colorPicker_backactive.TabIndex = 5; this.colorPicker_backactive.TabIndex = 5;
this.colorPicker_backactive.Text = "colorPicker3"; this.colorPicker_backactive.Text = "colorPicker3";
this.colorPicker_backactive.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255)))));
this.colorPicker_backactive.WaveSize = 0; this.colorPicker_backactive.WaveSize = 0;
// //
// colorPicker_backhover // colorPicker_backhover
@ -462,6 +427,7 @@
this.colorPicker_backhover.Size = new System.Drawing.Size(121, 34); this.colorPicker_backhover.Size = new System.Drawing.Size(121, 34);
this.colorPicker_backhover.TabIndex = 5; this.colorPicker_backhover.TabIndex = 5;
this.colorPicker_backhover.Text = "colorPicker2"; this.colorPicker_backhover.Text = "colorPicker2";
this.colorPicker_backhover.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255)))));
this.colorPicker_backhover.WaveSize = 0; this.colorPicker_backhover.WaveSize = 0;
// //
// colorPicker_foreactive // colorPicker_foreactive
@ -476,6 +442,7 @@
this.colorPicker_foreactive.Size = new System.Drawing.Size(121, 34); this.colorPicker_foreactive.Size = new System.Drawing.Size(121, 34);
this.colorPicker_foreactive.TabIndex = 5; this.colorPicker_foreactive.TabIndex = 5;
this.colorPicker_foreactive.Text = "colorPicker1"; this.colorPicker_foreactive.Text = "colorPicker1";
this.colorPicker_foreactive.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255)))));
this.colorPicker_foreactive.WaveSize = 0; this.colorPicker_foreactive.WaveSize = 0;
// //
// colorPicker_forecolor // colorPicker_forecolor
@ -490,6 +457,7 @@
this.colorPicker_forecolor.Size = new System.Drawing.Size(121, 34); this.colorPicker_forecolor.Size = new System.Drawing.Size(121, 34);
this.colorPicker_forecolor.TabIndex = 5; this.colorPicker_forecolor.TabIndex = 5;
this.colorPicker_forecolor.Text = "colorPicker1"; this.colorPicker_forecolor.Text = "colorPicker1";
this.colorPicker_forecolor.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255)))));
this.colorPicker_forecolor.WaveSize = 0; this.colorPicker_forecolor.WaveSize = 0;
// //
// label14 // label14
@ -538,7 +506,6 @@
// switch_unique // switch_unique
// //
this.switch_unique.Anchor = System.Windows.Forms.AnchorStyles.Left; this.switch_unique.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.switch_unique.AutoCheck = true;
this.switch_unique.Location = new System.Drawing.Point(126, 167); this.switch_unique.Location = new System.Drawing.Point(126, 167);
this.switch_unique.Name = "switch_unique"; this.switch_unique.Name = "switch_unique";
this.switch_unique.Size = new System.Drawing.Size(50, 26); this.switch_unique.Size = new System.Drawing.Size(50, 26);
@ -559,7 +526,6 @@
// switch_showsubback // switch_showsubback
// //
this.switch_showsubback.Anchor = System.Windows.Forms.AnchorStyles.Left; this.switch_showsubback.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.switch_showsubback.AutoCheck = true;
this.switch_showsubback.Location = new System.Drawing.Point(126, 127); this.switch_showsubback.Location = new System.Drawing.Point(126, 127);
this.switch_showsubback.Name = "switch_showsubback"; this.switch_showsubback.Name = "switch_showsubback";
this.switch_showsubback.Size = new System.Drawing.Size(50, 26); this.switch_showsubback.Size = new System.Drawing.Size(50, 26);
@ -580,7 +546,6 @@
// switch_round // switch_round
// //
this.switch_round.Anchor = System.Windows.Forms.AnchorStyles.Left; this.switch_round.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.switch_round.AutoCheck = true;
this.switch_round.Location = new System.Drawing.Point(126, 87); this.switch_round.Location = new System.Drawing.Point(126, 87);
this.switch_round.Name = "switch_round"; this.switch_round.Name = "switch_round";
this.switch_round.Size = new System.Drawing.Size(50, 26); this.switch_round.Size = new System.Drawing.Size(50, 26);
@ -601,7 +566,6 @@
// switch_indent // switch_indent
// //
this.switch_indent.Anchor = System.Windows.Forms.AnchorStyles.Left; this.switch_indent.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.switch_indent.AutoCheck = true;
this.switch_indent.Checked = true; this.switch_indent.Checked = true;
this.switch_indent.Location = new System.Drawing.Point(126, 47); this.switch_indent.Location = new System.Drawing.Point(126, 47);
this.switch_indent.Name = "switch_indent"; this.switch_indent.Name = "switch_indent";
@ -623,7 +587,6 @@
// switch_collapsed // switch_collapsed
// //
this.switch_collapsed.Anchor = System.Windows.Forms.AnchorStyles.Left; this.switch_collapsed.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.switch_collapsed.AutoCheck = true;
this.switch_collapsed.Location = new System.Drawing.Point(126, 7); this.switch_collapsed.Location = new System.Drawing.Point(126, 7);
this.switch_collapsed.Name = "switch_collapsed"; this.switch_collapsed.Name = "switch_collapsed";
this.switch_collapsed.Size = new System.Drawing.Size(50, 26); this.switch_collapsed.Size = new System.Drawing.Size(50, 26);

View File

@ -99,6 +99,7 @@
this.pageHeader3.SubText = "Demo"; this.pageHeader3.SubText = "Demo";
this.pageHeader3.TabIndex = 75; this.pageHeader3.TabIndex = 75;
this.pageHeader3.Text = "PageHeader"; this.pageHeader3.Text = "PageHeader";
this.pageHeader3.UseSubCenter = true;
// //
// label7 // label7
// //

View File

@ -29,7 +29,7 @@
private void InitializeComponent() private void InitializeComponent()
{ {
this.panel1 = new AntdUI.Panel(); this.panel1 = new AntdUI.Panel();
this.windowBar = new AntdUI.WindowBar(); this.pageHeader = new AntdUI.PageHeader();
this.button_close = new AntdUI.Button(); this.button_close = new AntdUI.Button();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
@ -37,7 +37,7 @@
// panel1 // panel1
// //
this.panel1.Controls.Add(this.button_close); this.panel1.Controls.Add(this.button_close);
this.panel1.Controls.Add(this.windowBar); this.panel1.Controls.Add(this.pageHeader);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
@ -46,18 +46,18 @@
this.panel1.TabIndex = 0; this.panel1.TabIndex = 0;
this.panel1.Text = "panel1"; this.panel1.Text = "panel1";
// //
// windowBar // pageHeader
// //
this.windowBar.Dock = System.Windows.Forms.DockStyle.Top; this.pageHeader.Dock = System.Windows.Forms.DockStyle.Top;
this.windowBar.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.pageHeader.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
this.windowBar.Location = new System.Drawing.Point(6, 6); this.pageHeader.Location = new System.Drawing.Point(6, 6);
this.windowBar.MaximizeBox = false; this.pageHeader.MaximizeBox = false;
this.windowBar.MinimizeBox = false; this.pageHeader.MinimizeBox = false;
this.windowBar.Name = "windowBar"; this.pageHeader.Name = "pageHeader";
this.windowBar.ShowIcon = false; this.pageHeader.ShowIcon = false;
this.windowBar.Size = new System.Drawing.Size(488, 32); this.pageHeader.Size = new System.Drawing.Size(488, 32);
this.windowBar.TabIndex = 1; this.pageHeader.TabIndex = 1;
this.windowBar.Text = "DrawerDemo"; this.pageHeader.Text = "DrawerDemo";
// //
// button_close // button_close
// //
@ -83,7 +83,7 @@
#endregion #endregion
private AntdUI.Panel panel1; private AntdUI.Panel panel1;
private AntdUI.WindowBar windowBar; private AntdUI.PageHeader pageHeader;
private AntdUI.Button button_close; private AntdUI.Button button_close;
} }
} }

View File

@ -1,187 +0,0 @@
namespace AntdUIDemo.Views
{
partial class WindowBarDemo
{
/// <summary>
/// 必需的设计器变量。
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// 清理所有正在使用的资源。
/// </summary>
/// <param name="disposing">如果应释放托管资源,为 true否则为 false。</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region
/// <summary>
/// 设计器支持所需的方法 - 不要修改
/// 使用代码编辑器修改此方法的内容。
/// </summary>
private void InitializeComponent()
{
this.stackPanel1 = new AntdUI.StackPanel();
this.windowBar4 = new AntdUI.WindowBar();
this.label6 = new AntdUI.Label();
this.windowBar3 = new AntdUI.WindowBar();
this.label5 = new AntdUI.Label();
this.windowBar2 = new AntdUI.WindowBar();
this.label3 = new AntdUI.Label();
this.windowBar1 = new AntdUI.WindowBar();
this.label4 = new AntdUI.Label();
this.header1 = new AntdUI.PageHeader();
this.stackPanel1.SuspendLayout();
this.SuspendLayout();
//
// stackPanel1
//
this.stackPanel1.Controls.Add(this.windowBar4);
this.stackPanel1.Controls.Add(this.label6);
this.stackPanel1.Controls.Add(this.windowBar3);
this.stackPanel1.Controls.Add(this.label5);
this.stackPanel1.Controls.Add(this.windowBar2);
this.stackPanel1.Controls.Add(this.label3);
this.stackPanel1.Controls.Add(this.windowBar1);
this.stackPanel1.Controls.Add(this.label4);
this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.stackPanel1.Location = new System.Drawing.Point(0, 74);
this.stackPanel1.Name = "stackPanel1";
this.stackPanel1.Size = new System.Drawing.Size(750, 453);
this.stackPanel1.TabIndex = 0;
this.stackPanel1.Text = "stackPanel1";
this.stackPanel1.Vertical = true;
//
// windowBar4
//
this.windowBar4.DividerColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34)))));
this.windowBar4.DividerMargin = 120;
this.windowBar4.DividerShow = true;
this.windowBar4.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.windowBar4.Icon = global::AntdUIDemo.Properties.Resources.logo;
this.windowBar4.IsMax = false;
this.windowBar4.Location = new System.Drawing.Point(3, 237);
this.windowBar4.Name = "windowBar4";
this.windowBar4.Size = new System.Drawing.Size(744, 32);
this.windowBar4.TabIndex = 73;
this.windowBar4.Text = "WindowBar";
//
// label6
//
this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.Location = new System.Drawing.Point(3, 207);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(744, 24);
this.label6.TabIndex = 72;
this.label6.Text = "线条样式";
//
// windowBar3
//
this.windowBar3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.windowBar3.Icon = global::AntdUIDemo.Properties.Resources.logo;
this.windowBar3.IsMax = false;
this.windowBar3.Location = new System.Drawing.Point(3, 169);
this.windowBar3.MaximizeBox = false;
this.windowBar3.MinimizeBox = false;
this.windowBar3.Name = "windowBar3";
this.windowBar3.Size = new System.Drawing.Size(744, 32);
this.windowBar3.TabIndex = 71;
this.windowBar3.Text = "WindowBar";
//
// label5
//
this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.Location = new System.Drawing.Point(3, 139);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(744, 24);
this.label5.TabIndex = 70;
this.label5.Text = "禁用最大/小化";
//
// windowBar2
//
this.windowBar2.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.windowBar2.Icon = global::AntdUIDemo.Properties.Resources.logo;
this.windowBar2.IsMax = false;
this.windowBar2.Loading = true;
this.windowBar2.Location = new System.Drawing.Point(3, 101);
this.windowBar2.Name = "windowBar2";
this.windowBar2.Size = new System.Drawing.Size(744, 32);
this.windowBar2.TabIndex = 69;
this.windowBar2.Text = "WindowBar";
//
// label3
//
this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.Location = new System.Drawing.Point(3, 71);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(744, 24);
this.label3.TabIndex = 68;
this.label3.Text = "加载状态";
//
// windowBar1
//
this.windowBar1.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.windowBar1.Icon = global::AntdUIDemo.Properties.Resources.logo;
this.windowBar1.IsMax = false;
this.windowBar1.Location = new System.Drawing.Point(3, 33);
this.windowBar1.Name = "windowBar1";
this.windowBar1.Size = new System.Drawing.Size(744, 32);
this.windowBar1.SubText = "Demo";
this.windowBar1.TabIndex = 66;
this.windowBar1.Text = "WindowBar";
//
// label4
//
this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.Location = new System.Drawing.Point(3, 3);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(744, 24);
this.label4.TabIndex = 65;
this.label4.Text = "基本用法";
//
// header1
//
this.header1.Description = "可自定义的窗口栏";
this.header1.DividerShow = true;
this.header1.Dock = System.Windows.Forms.DockStyle.Top;
this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F);
this.header1.Location = new System.Drawing.Point(0, 0);
this.header1.Name = "header1";
this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10);
this.header1.Size = new System.Drawing.Size(750, 74);
this.header1.TabIndex = 27;
this.header1.Text = "WindowBar 窗口栏";
this.header1.UseTitleFont = true;
//
// WindowBarDemo
//
this.Controls.Add(this.stackPanel1);
this.Controls.Add(this.header1);
this.Name = "WindowBarDemo";
this.Size = new System.Drawing.Size(750, 527);
this.stackPanel1.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
private AntdUI.StackPanel stackPanel1;
private AntdUI.Label label4;
private AntdUI.WindowBar windowBar1;
private AntdUI.Label label6;
private AntdUI.WindowBar windowBar3;
private AntdUI.Label label5;
private AntdUI.WindowBar windowBar2;
private AntdUI.Label label3;
private AntdUI.WindowBar windowBar4;
private AntdUI.PageHeader header1;
}
}

View File

@ -1,12 +0,0 @@
using System.Windows.Forms;
namespace AntdUIDemo.Views
{
public partial class WindowBarDemo : UserControl
{
public WindowBarDemo()
{
InitializeComponent();
}
}
}

View File

@ -1,120 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 294 KiB

After

Width:  |  Height:  |  Size: 292 KiB