diff --git a/MainWindow.Designer.cs b/MainWindow.Designer.cs index 9a4f326..ba3deea 100644 --- a/MainWindow.Designer.cs +++ b/MainWindow.Designer.cs @@ -29,7 +29,7 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow)); - AntdUI.Tabs.StyleCard styleCard3 = new AntdUI.Tabs.StyleCard(); + AntdUI.Tabs.StyleCard styleCard6 = new AntdUI.Tabs.StyleCard(); this.titlebar = new AntdUI.PageHeader(); this.input_search = new AntdUI.Input(); this.button_color = new AntdUI.Button(); @@ -135,8 +135,8 @@ this.tabs.Name = "tabs"; this.tabs.Pages.Add(this.tabPage); this.tabs.Size = new System.Drawing.Size(974, 560); - styleCard3.Closable = true; - this.tabs.Style = styleCard3; + styleCard6.Closable = true; + this.tabs.Style = styleCard6; this.tabs.TabIndex = 9; this.tabs.Type = AntdUI.TabType.Card; // diff --git a/README.md b/README.md index 6bc81f9..318980c 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ - ✅ 支持设置 Message/Notification 消息显示位置 ![SystemSet](assets/screenshots/Demo.png) +![SystemSet](assets/screenshots/Dark.png) ![SystemSet](assets/screenshots/SystemSet.png) ## 控件演示 diff --git a/Views/SegmentedDemo.Designer.cs b/Views/SegmentedDemo.Designer.cs index 6ee5dc2..cbd06c6 100644 --- a/Views/SegmentedDemo.Designer.cs +++ b/Views/SegmentedDemo.Designer.cs @@ -28,6 +28,11 @@ /// private void InitializeComponent() { + AntdUI.SegmentedItem segmentedItem1 = new AntdUI.SegmentedItem(); + AntdUI.SegmentedItem segmentedItem2 = new AntdUI.SegmentedItem(); + AntdUI.SegmentedItem segmentedItem3 = new AntdUI.SegmentedItem(); + AntdUI.SegmentedItem segmentedItem4 = new AntdUI.SegmentedItem(); + AntdUI.SegmentedItem segmentedItem5 = new AntdUI.SegmentedItem(); AntdUI.SegmentedItem segmentedItem6 = new AntdUI.SegmentedItem(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SegmentedDemo)); AntdUI.SegmentedItem segmentedItem7 = new AntdUI.SegmentedItem(); @@ -64,13 +69,9 @@ AntdUI.SegmentedItem segmentedItem38 = new AntdUI.SegmentedItem(); AntdUI.SegmentedItem segmentedItem39 = new AntdUI.SegmentedItem(); AntdUI.SegmentedItem segmentedItem40 = new AntdUI.SegmentedItem(); - AntdUI.SegmentedItem segmentedItem1 = new AntdUI.SegmentedItem(); - AntdUI.SegmentedItem segmentedItem2 = new AntdUI.SegmentedItem(); - AntdUI.SegmentedItem segmentedItem3 = new AntdUI.SegmentedItem(); - AntdUI.SegmentedItem segmentedItem4 = new AntdUI.SegmentedItem(); - AntdUI.SegmentedItem segmentedItem5 = new AntdUI.SegmentedItem(); this.stackPanel1 = new AntdUI.StackPanel(); this.flowPanel8 = new AntdUI.FlowPanel(); + this.segmented9 = new AntdUI.Segmented(); this.segmented8 = new AntdUI.Segmented(); this.flowPanel4 = new AntdUI.FlowPanel(); this.segmented4 = new AntdUI.Segmented(); @@ -89,7 +90,6 @@ this.segmented1 = new AntdUI.Segmented(); this.label3 = new AntdUI.Label(); this.header1 = new AntdUI.PageHeader(); - this.segmented9 = new AntdUI.Segmented(); this.stackPanel1.SuspendLayout(); this.flowPanel8.SuspendLayout(); this.flowPanel4.SuspendLayout(); @@ -117,7 +117,7 @@ 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, 837); + this.stackPanel1.Size = new System.Drawing.Size(750, 795); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -126,12 +126,45 @@ // this.flowPanel8.Controls.Add(this.segmented9); this.flowPanel8.Controls.Add(this.segmented8); - this.flowPanel8.Location = new System.Drawing.Point(3, 463); + this.flowPanel8.Location = new System.Drawing.Point(3, 425); this.flowPanel8.Name = "flowPanel8"; - this.flowPanel8.Size = new System.Drawing.Size(744, 371); + this.flowPanel8.Size = new System.Drawing.Size(744, 367); this.flowPanel8.TabIndex = 45; this.flowPanel8.Text = "flowPanel8"; // + // segmented9 + // + this.segmented9.BackActive = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); + this.segmented9.BarPadding = 12; + this.segmented9.BarPosition = AntdUI.TAlignMini.Right; + this.segmented9.BarRadius = 4; + this.segmented9.BarSize = 2F; + this.segmented9.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.segmented9.Full = true; + this.segmented9.IconRatio = 1.5F; + segmentedItem1.IconSvg = "AndroidOutlined"; + segmentedItem1.Text = "Android\r\nOutlined"; + segmentedItem2.IconSvg = "AppleOutlined"; + segmentedItem2.Text = "Apple\r\nOutlined"; + segmentedItem3.IconSvg = "WindowsOutlined"; + segmentedItem3.Text = "Windows\r\nOutlined"; + segmentedItem4.IconSvg = "IeOutlined"; + segmentedItem4.Text = "Ie\r\nOutlined"; + segmentedItem5.IconSvg = "ChromeOutlined"; + segmentedItem5.Text = "Chrome\r\nOutlined"; + this.segmented9.Items.Add(segmentedItem1); + this.segmented9.Items.Add(segmentedItem2); + this.segmented9.Items.Add(segmentedItem3); + this.segmented9.Items.Add(segmentedItem4); + this.segmented9.Items.Add(segmentedItem5); + this.segmented9.Location = new System.Drawing.Point(79, 3); + this.segmented9.Name = "segmented9"; + this.segmented9.SelectIndex = 0; + this.segmented9.Size = new System.Drawing.Size(70, 355); + this.segmented9.TabIndex = 1; + this.segmented9.Text = "segmented9"; + this.segmented9.Vertical = true; + // // segmented8 // this.segmented8.BackActive = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); @@ -161,7 +194,7 @@ this.segmented8.Location = new System.Drawing.Point(3, 3); this.segmented8.Name = "segmented8"; this.segmented8.SelectIndex = 0; - this.segmented8.Size = new System.Drawing.Size(121, 355); + this.segmented8.Size = new System.Drawing.Size(70, 355); this.segmented8.TabIndex = 0; this.segmented8.Text = "segmented8"; this.segmented8.Vertical = true; @@ -171,7 +204,7 @@ this.flowPanel4.Controls.Add(this.segmented4); this.flowPanel4.Location = new System.Drawing.Point(3, 381); this.flowPanel4.Name = "flowPanel4"; - this.flowPanel4.Size = new System.Drawing.Size(744, 76); + this.flowPanel4.Size = new System.Drawing.Size(744, 38); this.flowPanel4.TabIndex = 44; this.flowPanel4.Text = "flowPanel4"; // @@ -180,8 +213,6 @@ this.segmented4.BackActive = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); this.segmented4.BarPadding = 8; this.segmented4.BarPosition = AntdUI.TAlignMini.Bottom; - this.segmented4.BarRadius = 4; - this.segmented4.BarSize = 4F; this.segmented4.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.segmented4.Full = true; segmentedItem11.Text = "Daily"; @@ -197,7 +228,7 @@ this.segmented4.Location = new System.Drawing.Point(3, 3); this.segmented4.Name = "segmented4"; this.segmented4.SelectIndex = 0; - this.segmented4.Size = new System.Drawing.Size(500, 70); + this.segmented4.Size = new System.Drawing.Size(500, 32); this.segmented4.TabIndex = 0; this.segmented4.Text = "segmented4"; // @@ -262,8 +293,10 @@ // // segmented5 // + this.segmented5.BackActive = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(152)))), ((int)(((byte)(0))))); this.segmented5.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.segmented5.Full = true; + this.segmented5.IconRatio = 1.2F; segmentedItem21.IconSvg = resources.GetString("segmentedItem21.IconSvg"); segmentedItem21.Text = ""; segmentedItem22.IconSvg = resources.GetString("segmentedItem22.IconSvg"); @@ -424,39 +457,12 @@ this.header1.Text = "Segmented 分段控制器"; this.header1.UseTitleFont = true; // - // segmented9 - // - this.segmented9.BackActive = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); - this.segmented9.BarPadding = 8; - this.segmented9.BarPosition = AntdUI.TAlignMini.Bottom; - this.segmented9.BarRadius = 4; - this.segmented9.BarSize = 4F; - this.segmented9.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.segmented9.Full = true; - segmentedItem1.Text = "Daily"; - segmentedItem2.Text = "Weekly"; - segmentedItem3.Text = "Monthly"; - segmentedItem4.Text = "Quarterly"; - segmentedItem5.Text = "Yearly"; - this.segmented9.Items.Add(segmentedItem1); - this.segmented9.Items.Add(segmentedItem2); - this.segmented9.Items.Add(segmentedItem3); - this.segmented9.Items.Add(segmentedItem4); - this.segmented9.Items.Add(segmentedItem5); - this.segmented9.Location = new System.Drawing.Point(130, 3); - this.segmented9.Name = "segmented9"; - this.segmented9.SelectIndex = 0; - this.segmented9.Size = new System.Drawing.Size(81, 355); - this.segmented9.TabIndex = 1; - this.segmented9.Text = "segmented9"; - this.segmented9.Vertical = true; - // // SegmentedDemo // this.Controls.Add(this.stackPanel1); this.Controls.Add(this.header1); this.Name = "SegmentedDemo"; - this.Size = new System.Drawing.Size(750, 911); + this.Size = new System.Drawing.Size(750, 869); this.stackPanel1.ResumeLayout(false); this.flowPanel8.ResumeLayout(false); this.flowPanel4.ResumeLayout(false); diff --git a/Views/SegmentedDemo.cs b/Views/SegmentedDemo.cs index 8a5bccd..684dbdd 100644 --- a/Views/SegmentedDemo.cs +++ b/Views/SegmentedDemo.cs @@ -8,9 +8,6 @@ namespace AntdUIDemo.Views public SegmentedDemo() { InitializeComponent(); - segmented4.Items[0].Text = "Daily\nDaily"; - - segmented9.Items[0].Text = "Daily\nDaily"; } } } diff --git a/assets/screenshots/Dark.png b/assets/screenshots/Dark.png new file mode 100644 index 0000000..647890e Binary files /dev/null and b/assets/screenshots/Dark.png differ diff --git a/assets/screenshots/Demo.png b/assets/screenshots/Demo.png index 4ac2e7c..d47c9e1 100644 Binary files a/assets/screenshots/Demo.png and b/assets/screenshots/Demo.png differ diff --git a/assets/screenshots/FlowPanel.png b/assets/screenshots/FlowPanel.png index 4f334b6..735811a 100644 Binary files a/assets/screenshots/FlowPanel.png and b/assets/screenshots/FlowPanel.png differ diff --git a/assets/screenshots/Segmented.png b/assets/screenshots/Segmented.png index 5da2241..fa26eb8 100644 Binary files a/assets/screenshots/Segmented.png and b/assets/screenshots/Segmented.png differ diff --git a/assets/screenshots/SystemSet.png b/assets/screenshots/SystemSet.png index 0edd6fe..8d9292a 100644 Binary files a/assets/screenshots/SystemSet.png and b/assets/screenshots/SystemSet.png differ