diff --git a/Bin/SunnyUI.Demo.exe b/Bin/SunnyUI.Demo.exe index a69d8ad5..b7b00f09 100644 Binary files a/Bin/SunnyUI.Demo.exe and b/Bin/SunnyUI.Demo.exe differ diff --git a/Bin/SunnyUI.dll b/Bin/SunnyUI.dll index fc3115d6..f5531a8e 100644 Binary files a/Bin/SunnyUI.dll and b/Bin/SunnyUI.dll differ diff --git a/SunnyUI.Demo/Charts/FPieChart.Designer.cs b/SunnyUI.Demo/Charts/FPieChart.Designer.cs index 9c1aa4ae..d614c06f 100644 --- a/SunnyUI.Demo/Charts/FPieChart.Designer.cs +++ b/SunnyUI.Demo/Charts/FPieChart.Designer.cs @@ -28,17 +28,16 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); this.uiLine1 = new Sunny.UI.UILine(); this.PieChart = new Sunny.UI.UIPieChart(); - this.uiImageButton1 = new Sunny.UI.UIImageButton(); - this.uiImageButton2 = new Sunny.UI.UIImageButton(); - this.uiImageButton3 = new Sunny.UI.UIImageButton(); this.uiSymbolButton1 = new Sunny.UI.UISymbolButton(); + this.uiImageButton3 = new Sunny.UI.UIImageButton(); + this.uiImageButton2 = new Sunny.UI.UIImageButton(); + this.uiImageButton1 = new Sunny.UI.UIImageButton(); this.PagePanel.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.uiImageButton1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.uiImageButton2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.uiImageButton3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.uiImageButton2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.uiImageButton1)).BeginInit(); this.SuspendLayout(); // // PagePanel @@ -69,6 +68,7 @@ this.PieChart.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(54)))), ((int)(((byte)(54))))); this.PieChart.LegendFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.PieChart.Location = new System.Drawing.Point(30, 48); + this.PieChart.MinimumSize = new System.Drawing.Size(1, 1); this.PieChart.Name = "PieChart"; this.PieChart.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; this.PieChart.Size = new System.Drawing.Size(670, 400); @@ -76,33 +76,19 @@ this.PieChart.TabIndex = 20; this.PieChart.Text = "uiPieChart1"; // - // uiImageButton1 + // uiSymbolButton1 // - this.uiImageButton1.Cursor = System.Windows.Forms.Cursors.Hand; - this.uiImageButton1.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiImageButton1.Image = global::Sunny.UI.Demo.Properties.Resources.ChartDefaultStyle; - this.uiImageButton1.Location = new System.Drawing.Point(30, 466); - this.uiImageButton1.Name = "uiImageButton1"; - this.uiImageButton1.Size = new System.Drawing.Size(100, 27); - this.uiImageButton1.TabIndex = 21; - this.uiImageButton1.TabStop = false; - this.uiImageButton1.Text = " Default"; - this.uiImageButton1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.uiImageButton1.Click += new System.EventHandler(this.uiImageButton1_Click); - // - // uiImageButton2 - // - this.uiImageButton2.Cursor = System.Windows.Forms.Cursors.Hand; - this.uiImageButton2.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiImageButton2.Image = global::Sunny.UI.Demo.Properties.Resources.ChartPlainStyle; - this.uiImageButton2.Location = new System.Drawing.Point(136, 466); - this.uiImageButton2.Name = "uiImageButton2"; - this.uiImageButton2.Size = new System.Drawing.Size(100, 27); - this.uiImageButton2.TabIndex = 22; - this.uiImageButton2.TabStop = false; - this.uiImageButton2.Text = " Plain"; - this.uiImageButton2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.uiImageButton2.Click += new System.EventHandler(this.uiImageButton2_Click); + this.uiSymbolButton1.Cursor = System.Windows.Forms.Cursors.Hand; + this.uiSymbolButton1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiSymbolButton1.Location = new System.Drawing.Point(348, 466); + this.uiSymbolButton1.MinimumSize = new System.Drawing.Size(1, 1); + this.uiSymbolButton1.Name = "uiSymbolButton1"; + this.uiSymbolButton1.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); + this.uiSymbolButton1.Size = new System.Drawing.Size(100, 27); + this.uiSymbolButton1.Symbol = 61952; + this.uiSymbolButton1.TabIndex = 24; + this.uiSymbolButton1.Text = "数据"; + this.uiSymbolButton1.Click += new System.EventHandler(this.uiSymbolButton1_Click); // // uiImageButton3 // @@ -118,18 +104,33 @@ this.uiImageButton3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.uiImageButton3.Click += new System.EventHandler(this.uiImageButton3_Click); // - // uiSymbolButton1 + // uiImageButton2 // - this.uiSymbolButton1.Cursor = System.Windows.Forms.Cursors.Hand; - this.uiSymbolButton1.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiSymbolButton1.Location = new System.Drawing.Point(348, 466); - this.uiSymbolButton1.Name = "uiSymbolButton1"; - this.uiSymbolButton1.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); - this.uiSymbolButton1.Size = new System.Drawing.Size(100, 27); - this.uiSymbolButton1.Symbol = 61952; - this.uiSymbolButton1.TabIndex = 24; - this.uiSymbolButton1.Text = "数据"; - this.uiSymbolButton1.Click += new System.EventHandler(this.uiSymbolButton1_Click); + this.uiImageButton2.Cursor = System.Windows.Forms.Cursors.Hand; + this.uiImageButton2.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiImageButton2.Image = global::Sunny.UI.Demo.Properties.Resources.ChartPlainStyle; + this.uiImageButton2.Location = new System.Drawing.Point(136, 466); + this.uiImageButton2.Name = "uiImageButton2"; + this.uiImageButton2.Size = new System.Drawing.Size(100, 27); + this.uiImageButton2.TabIndex = 22; + this.uiImageButton2.TabStop = false; + this.uiImageButton2.Text = " Plain"; + this.uiImageButton2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.uiImageButton2.Click += new System.EventHandler(this.uiImageButton2_Click); + // + // uiImageButton1 + // + this.uiImageButton1.Cursor = System.Windows.Forms.Cursors.Hand; + this.uiImageButton1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiImageButton1.Image = global::Sunny.UI.Demo.Properties.Resources.ChartDefaultStyle; + this.uiImageButton1.Location = new System.Drawing.Point(30, 466); + this.uiImageButton1.Name = "uiImageButton1"; + this.uiImageButton1.Size = new System.Drawing.Size(100, 27); + this.uiImageButton1.TabIndex = 21; + this.uiImageButton1.TabStop = false; + this.uiImageButton1.Text = " Default"; + this.uiImageButton1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.uiImageButton1.Click += new System.EventHandler(this.uiImageButton1_Click); // // FPieChart // @@ -140,9 +141,9 @@ this.Symbol = 61952; this.Text = "PieChart"; this.PagePanel.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.uiImageButton1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.uiImageButton2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.uiImageButton3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.uiImageButton2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.uiImageButton1)).EndInit(); this.ResumeLayout(false); } diff --git a/SunnyUI.Demo/Charts/FPieChart.resx b/SunnyUI.Demo/Charts/FPieChart.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/SunnyUI.Demo/Charts/FPieChart.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/Controls/FPanel.Designer.cs b/SunnyUI.Demo/Controls/FPanel.Designer.cs index 9334660e..8e6fd297 100644 --- a/SunnyUI.Demo/Controls/FPanel.Designer.cs +++ b/SunnyUI.Demo/Controls/FPanel.Designer.cs @@ -37,9 +37,9 @@ // // PagePanel // + this.PagePanel.Controls.Add(this.uiPanel1); this.PagePanel.Controls.Add(this.uiTitlePanel2); this.PagePanel.Controls.Add(this.uiGroupBox1); - this.PagePanel.Controls.Add(this.uiPanel1); this.PagePanel.Controls.Add(this.uiTitlePanel1); this.PagePanel.Size = new System.Drawing.Size(800, 453); // diff --git a/SunnyUI.Demo/SunnyUI.Demo.csproj b/SunnyUI.Demo/SunnyUI.Demo.csproj index bca3452a..ce5804fb 100644 --- a/SunnyUI.Demo/SunnyUI.Demo.csproj +++ b/SunnyUI.Demo/SunnyUI.Demo.csproj @@ -319,6 +319,9 @@ FLineChart.cs + + FPieChart.cs + FAvatar.cs diff --git a/SunnyUI/Controls/DropItem/UIDateItem.cs b/SunnyUI/Controls/DropItem/UIDateItem.cs index 1eb9142b..86b671df 100644 --- a/SunnyUI/Controls/DropItem/UIDateItem.cs +++ b/SunnyUI/Controls/DropItem/UIDateItem.cs @@ -64,9 +64,9 @@ namespace Sunny.UI this.tabPage2.SuspendLayout(); this.tabPage3.SuspendLayout(); this.SuspendLayout(); - // + // // TopPanel - // + // this.TopPanel.Controls.Add(this.b4); this.TopPanel.Controls.Add(this.b3); this.TopPanel.Controls.Add(this.b2); @@ -76,6 +76,7 @@ namespace Sunny.UI this.TopPanel.Font = new System.Drawing.Font("微软雅黑", 12F); this.TopPanel.Location = new System.Drawing.Point(0, 0); this.TopPanel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.TopPanel.MinimumSize = new System.Drawing.Size(1, 1); this.TopPanel.Name = "TopPanel"; this.TopPanel.RadiusSides = Sunny.UI.UICornerRadiusSides.None; this.TopPanel.RectSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)(((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) @@ -86,9 +87,9 @@ namespace Sunny.UI this.TopPanel.TabIndex = 0; this.TopPanel.Text = "2020-05-05"; this.TopPanel.Click += new System.EventHandler(this.TopPanel_Click); - // + // // b4 - // + // this.b4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.b4.BackColor = System.Drawing.Color.Transparent; this.b4.Cursor = System.Windows.Forms.Cursors.Hand; @@ -98,6 +99,7 @@ namespace Sunny.UI this.b4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.b4.ImageInterval = 0; this.b4.Location = new System.Drawing.Point(427, 4); + this.b4.MinimumSize = new System.Drawing.Size(1, 1); this.b4.Name = "b4"; this.b4.Padding = new System.Windows.Forms.Padding(24, 0, 0, 0); this.b4.RadiusSides = Sunny.UI.UICornerRadiusSides.None; @@ -109,9 +111,9 @@ namespace Sunny.UI this.b4.Symbol = 61697; this.b4.TabIndex = 3; this.b4.Click += new System.EventHandler(this.b4_Click); - // + // // b3 - // + // this.b3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.b3.BackColor = System.Drawing.Color.Transparent; this.b3.Cursor = System.Windows.Forms.Cursors.Hand; @@ -121,6 +123,7 @@ namespace Sunny.UI this.b3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.b3.ImageInterval = 0; this.b3.Location = new System.Drawing.Point(391, 4); + this.b3.MinimumSize = new System.Drawing.Size(1, 1); this.b3.Name = "b3"; this.b3.Padding = new System.Windows.Forms.Padding(24, 0, 0, 0); this.b3.RadiusSides = Sunny.UI.UICornerRadiusSides.None; @@ -132,9 +135,9 @@ namespace Sunny.UI this.b3.Symbol = 61701; this.b3.TabIndex = 2; this.b3.Click += new System.EventHandler(this.b3_Click); - // + // // b2 - // + // this.b2.BackColor = System.Drawing.Color.Transparent; this.b2.Cursor = System.Windows.Forms.Cursors.Hand; this.b2.FillColor = System.Drawing.Color.White; @@ -143,6 +146,7 @@ namespace Sunny.UI this.b2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.b2.ImageInterval = 0; this.b2.Location = new System.Drawing.Point(40, 4); + this.b2.MinimumSize = new System.Drawing.Size(1, 1); this.b2.Name = "b2"; this.b2.Padding = new System.Windows.Forms.Padding(24, 0, 0, 0); this.b2.RadiusSides = Sunny.UI.UICornerRadiusSides.None; @@ -154,9 +158,9 @@ namespace Sunny.UI this.b2.Symbol = 61700; this.b2.TabIndex = 1; this.b2.Click += new System.EventHandler(this.b2_Click); - // + // // b1 - // + // this.b1.BackColor = System.Drawing.Color.Transparent; this.b1.Cursor = System.Windows.Forms.Cursors.Hand; this.b1.FillColor = System.Drawing.Color.White; @@ -165,6 +169,7 @@ namespace Sunny.UI this.b1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.b1.ImageInterval = 0; this.b1.Location = new System.Drawing.Point(4, 4); + this.b1.MinimumSize = new System.Drawing.Size(1, 1); this.b1.Name = "b1"; this.b1.Padding = new System.Windows.Forms.Padding(24, 0, 0, 0); this.b1.RadiusSides = Sunny.UI.UICornerRadiusSides.None; @@ -176,9 +181,9 @@ namespace Sunny.UI this.b1.Symbol = 61696; this.b1.TabIndex = 0; this.b1.Click += new System.EventHandler(this.b1_Click); - // + // // TabControl - // + // this.TabControl.Controls.Add(this.tabPage1); this.TabControl.Controls.Add(this.tabPage2); this.TabControl.Controls.Add(this.tabPage3); @@ -194,9 +199,9 @@ namespace Sunny.UI this.TabControl.Style = Sunny.UI.UIStyle.Custom; this.TabControl.TabIndex = 1; this.TabControl.SelectedIndexChanged += new System.EventHandler(this.TabControl_SelectedIndexChanged); - // + // // tabPage1 - // + // this.tabPage1.Controls.Add(this.p1); this.tabPage1.Location = new System.Drawing.Point(0, 40); this.tabPage1.Name = "tabPage1"; @@ -204,14 +209,15 @@ namespace Sunny.UI this.tabPage1.TabIndex = 0; this.tabPage1.Text = "tabPage1"; this.tabPage1.UseVisualStyleBackColor = true; - // + // // p1 - // + // this.p1.Dock = System.Windows.Forms.DockStyle.Fill; this.p1.FillColor = System.Drawing.Color.White; this.p1.Font = new System.Drawing.Font("微软雅黑", 12F); this.p1.Location = new System.Drawing.Point(0, 0); this.p1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.p1.MinimumSize = new System.Drawing.Size(1, 1); this.p1.Name = "p1"; this.p1.RadiusSides = Sunny.UI.UICornerRadiusSides.None; this.p1.Size = new System.Drawing.Size(461, 277); @@ -221,9 +227,9 @@ namespace Sunny.UI this.p1.PaintOther += new System.Windows.Forms.PaintEventHandler(this.p1_PaintOther); this.p1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.p1_MouseClick); this.p1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.p1_MouseMove); - // + // // tabPage2 - // + // this.tabPage2.Controls.Add(this.p2); this.tabPage2.Location = new System.Drawing.Point(0, 40); this.tabPage2.Name = "tabPage2"; @@ -231,14 +237,15 @@ namespace Sunny.UI this.tabPage2.TabIndex = 1; this.tabPage2.Text = "tabPage2"; this.tabPage2.UseVisualStyleBackColor = true; - // + // // p2 - // + // this.p2.Dock = System.Windows.Forms.DockStyle.Fill; this.p2.FillColor = System.Drawing.Color.White; this.p2.Font = new System.Drawing.Font("微软雅黑", 12F); this.p2.Location = new System.Drawing.Point(0, 0); this.p2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.p2.MinimumSize = new System.Drawing.Size(1, 1); this.p2.Name = "p2"; this.p2.RadiusSides = Sunny.UI.UICornerRadiusSides.None; this.p2.Size = new System.Drawing.Size(450, 230); @@ -248,9 +255,9 @@ namespace Sunny.UI this.p2.PaintOther += new System.Windows.Forms.PaintEventHandler(this.p2_PaintOther); this.p2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.p2_MouseClick); this.p2.MouseMove += new System.Windows.Forms.MouseEventHandler(this.p2_MouseMove); - // + // // tabPage3 - // + // this.tabPage3.Controls.Add(this.p3); this.tabPage3.Location = new System.Drawing.Point(0, 40); this.tabPage3.Name = "tabPage3"; @@ -258,14 +265,15 @@ namespace Sunny.UI this.tabPage3.TabIndex = 2; this.tabPage3.Text = "tabPage3"; this.tabPage3.UseVisualStyleBackColor = true; - // + // // p3 - // + // this.p3.Dock = System.Windows.Forms.DockStyle.Fill; this.p3.FillColor = System.Drawing.Color.White; this.p3.Font = new System.Drawing.Font("微软雅黑", 12F); this.p3.Location = new System.Drawing.Point(0, 0); this.p3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.p3.MinimumSize = new System.Drawing.Size(1, 1); this.p3.Name = "p3"; this.p3.RadiusSides = Sunny.UI.UICornerRadiusSides.None; this.p3.Size = new System.Drawing.Size(461, 277); @@ -275,9 +283,9 @@ namespace Sunny.UI this.p3.PaintOther += new System.Windows.Forms.PaintEventHandler(this.p3_PaintOther); this.p3.MouseClick += new System.Windows.Forms.MouseEventHandler(this.p3_MouseClick); this.p3.MouseMove += new System.Windows.Forms.MouseEventHandler(this.p3_MouseMove); - // + // // UIDateItem - // + // this.Controls.Add(this.TabControl); this.Controls.Add(this.TopPanel); this.FillColor = System.Drawing.Color.White; @@ -290,6 +298,7 @@ namespace Sunny.UI this.tabPage2.ResumeLayout(false); this.tabPage3.ResumeLayout(false); this.ResumeLayout(false); + } #endregion InitializeComponent @@ -583,8 +592,8 @@ namespace Sunny.UI private void p1_MouseClick(object sender, System.Windows.Forms.MouseEventArgs e) { - int width = p2.Width / 4; - int height = p2.Height / 3; + int width = p1.Width / 4; + int height = p1.Height / 3; int x = e.Location.X / width; int y = e.Location.Y / height; int iy = x + y * 4; diff --git a/SunnyUI/Controls/DropItem/UIDateItem.resx b/SunnyUI/Controls/DropItem/UIDateItem.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/SunnyUI/Controls/DropItem/UIDateItem.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/Controls/DropItem/UIDateTimeItem.cs b/SunnyUI/Controls/DropItem/UIDateTimeItem.cs index 0576b028..8a7b1545 100644 --- a/SunnyUI/Controls/DropItem/UIDateTimeItem.cs +++ b/SunnyUI/Controls/DropItem/UIDateTimeItem.cs @@ -1132,8 +1132,8 @@ namespace Sunny.UI private void p1_MouseClick(object sender, System.Windows.Forms.MouseEventArgs e) { - int width = p2.Width / 4; - int height = p2.Height / 3; + int width = p1.Width / 4; + int height = p1.Height / 3; int x = e.Location.X / width; int y = e.Location.Y / height; int iy = x + y * 4; diff --git a/SunnyUI/SunnyUI.csproj b/SunnyUI/SunnyUI.csproj index b027c2ce..5514798b 100644 --- a/SunnyUI/SunnyUI.csproj +++ b/SunnyUI/SunnyUI.csproj @@ -543,6 +543,9 @@ UIComboTreeViewItem.cs + + UIDateItem.cs + UIComboTreeView.cs