Skip to content

刘韬 / HZH_Controls

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 21728239 由 HZH
选项

step bug

1 个父辈 46dac587
内嵌 并排
正在显示 3 个修改的文件 包含 93 行增加 和 93 行删除
HZH_Controls/HZH_Controls/Controls/Step/UCStep.cs
...@@ -271,7 +271,7 @@ namespace HZH_Controls.Controls ...@@ -271,7 +271,7 @@ namespace HZH_Controls.Controls
} }
int intSplitWidth = 20; int intSplitWidth = 20;
intSplitWidth = (this.Width - m_steps.Length - (m_steps.Length * m_stepWidth) - intRight) / (m_steps.Length - 1); intSplitWidth = (this.Width - m_steps.Length - (m_steps.Length * m_stepWidth) - intRight - intLeft) / (m_steps.Length - 1);
if (intSplitWidth < 20) if (intSplitWidth < 20)
intSplitWidth = 20; intSplitWidth = 20;
m_lstCacheRect = new List<Rectangle>(); m_lstCacheRect = new List<Rectangle>();
...@@ -310,12 +310,12 @@ namespace HZH_Controls.Controls ...@@ -310,12 +310,12 @@ namespace HZH_Controls.Controls
{ {
if (m_stepIndex == i + 1) if (m_stepIndex == i + 1)
{ {
g.DrawLine(new Pen(m_stepForeColor, m_lineWidth), new Point(intLeft + i * (m_stepWidth + intSplitWidth) + m_stepWidth - 3, y + ((m_stepWidth) / 2)), new Point((i + 1) * (m_stepWidth + intSplitWidth) - intSplitWidth / 2 + 1 + 6, y + ((m_stepWidth) / 2))); g.DrawLine(new Pen(m_stepForeColor, m_lineWidth), new Point(intLeft + i * (m_stepWidth + intSplitWidth) + m_stepWidth - 3, y + ((m_stepWidth) / 2)), new Point(intLeft + i * (m_stepWidth + intSplitWidth) + m_stepWidth + intSplitWidth / 2, y + ((m_stepWidth) / 2)));
g.DrawLine(new Pen(m_stepBackColor, m_lineWidth), new Point(intLeft + i * (m_stepWidth + intSplitWidth) + m_stepWidth + intSplitWidth / 2, y + ((m_stepWidth) / 2)), new Point((i + 1) * (m_stepWidth + intSplitWidth) + 10, y + ((m_stepWidth) / 2))); g.DrawLine(new Pen(m_stepBackColor, m_lineWidth), new Point(intLeft + i * (m_stepWidth + intSplitWidth) + m_stepWidth + intSplitWidth / 2, y + ((m_stepWidth) / 2)), new Point(intLeft + (i + 1) * (m_stepWidth + intSplitWidth) + 10, y + ((m_stepWidth) / 2)));
} }
else else
{ {
g.DrawLine(new Pen(m_stepForeColor, m_lineWidth), new Point(intLeft + i * (m_stepWidth + intSplitWidth) + m_stepWidth - 3, y + ((m_stepWidth) / 2)), new Point((i + 1) * (m_stepWidth + intSplitWidth) + 10, y + ((m_stepWidth) / 2))); g.DrawLine(new Pen(m_stepForeColor, m_lineWidth), new Point(intLeft + i * (m_stepWidth + intSplitWidth) + m_stepWidth - 3, y + ((m_stepWidth) / 2)), new Point(intLeft + (i + 1) * (m_stepWidth + intSplitWidth) + 10, y + ((m_stepWidth) / 2)));
} }
} }
} }
...@@ -323,7 +323,7 @@ namespace HZH_Controls.Controls ...@@ -323,7 +323,7 @@ namespace HZH_Controls.Controls
{ {
if (i != m_steps.Length - 1) if (i != m_steps.Length - 1)
{ {
g.DrawLine(new Pen(m_stepBackColor, m_lineWidth), new Point(intLeft + i * (m_stepWidth + intSplitWidth) + m_stepWidth - 3, y + ((m_stepWidth) / 2)), new Point((i + 1) * (m_stepWidth + intSplitWidth) + 10, y + ((m_stepWidth) / 2))); g.DrawLine(new Pen(m_stepBackColor, m_lineWidth), new Point(intLeft + i * (m_stepWidth + intSplitWidth) + m_stepWidth - 3, y + ((m_stepWidth) / 2)), new Point(intLeft + (i + 1) * (m_stepWidth + intSplitWidth) + 10, y + ((m_stepWidth) / 2)));
} }
} }
} }
......
HZH_Controls/Test/UC/UCTestStep.Designer.cs
...@@ -29,14 +29,80 @@ ...@@ -29,14 +29,80 @@
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UCTestStep)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UCTestStep));
this.ucStep2 = new HZH_Controls.Controls.UCStep();
this.ucStep1 = new HZH_Controls.Controls.UCStep();
this.ucStep3 = new HZH_Controls.Controls.UCStep();
this.ucStep4 = new HZH_Controls.Controls.UCStep(); this.ucStep4 = new HZH_Controls.Controls.UCStep();
this.ucStep5 = new HZH_Controls.Controls.UCStep();
this.ucStep6 = new HZH_Controls.Controls.UCStep(); this.ucStep6 = new HZH_Controls.Controls.UCStep();
this.ucStep5 = new HZH_Controls.Controls.UCStep();
this.ucStep2 = new HZH_Controls.Controls.UCStep();
this.ucStep3 = new HZH_Controls.Controls.UCStep();
this.ucStep1 = new HZH_Controls.Controls.UCStep();
this.SuspendLayout(); this.SuspendLayout();
// //
// ucStep4
//
this.ucStep4.BackColor = System.Drawing.Color.Transparent;
this.ucStep4.Font = new System.Drawing.Font("微软雅黑", 12F);
this.ucStep4.ImgCompleted = null;
this.ucStep4.LineWidth = 10;
this.ucStep4.Location = new System.Drawing.Point(409, 133);
this.ucStep4.Name = "ucStep4";
this.ucStep4.Size = new System.Drawing.Size(418, 86);
this.ucStep4.StepBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(189)))), ((int)(((byte)(189)))), ((int)(((byte)(189)))));
this.ucStep4.StepFontColor = System.Drawing.Color.White;
this.ucStep4.StepForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(157)))), ((int)(((byte)(144)))));
this.ucStep4.StepIndex = 2;
this.ucStep4.Steps = new string[] {
"step1",
"step2",
"step3",
"step4",
"step5"};
this.ucStep4.StepWidth = 35;
this.ucStep4.TabIndex = 1;
//
// ucStep6
//
this.ucStep6.BackColor = System.Drawing.Color.Transparent;
this.ucStep6.Font = new System.Drawing.Font("微软雅黑", 12F);
this.ucStep6.ImgCompleted = null;
this.ucStep6.LineWidth = 10;
this.ucStep6.Location = new System.Drawing.Point(29, 340);
this.ucStep6.Name = "ucStep6";
this.ucStep6.Size = new System.Drawing.Size(1205, 109);
this.ucStep6.StepBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(189)))), ((int)(((byte)(189)))), ((int)(((byte)(189)))));
this.ucStep6.StepFontColor = System.Drawing.Color.White;
this.ucStep6.StepForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(157)))), ((int)(((byte)(144)))));
this.ucStep6.StepIndex = 2;
this.ucStep6.Steps = new string[] {
"step1aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
"step2",
"step3",
"step4",
"step5aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"};
this.ucStep6.StepWidth = 35;
this.ucStep6.TabIndex = 1;
//
// ucStep5
//
this.ucStep5.BackColor = System.Drawing.Color.Transparent;
this.ucStep5.Font = new System.Drawing.Font("微软雅黑", 12F);
this.ucStep5.ImgCompleted = null;
this.ucStep5.LineWidth = 10;
this.ucStep5.Location = new System.Drawing.Point(29, 225);
this.ucStep5.Name = "ucStep5";
this.ucStep5.Size = new System.Drawing.Size(742, 109);
this.ucStep5.StepBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(189)))), ((int)(((byte)(189)))), ((int)(((byte)(189)))));
this.ucStep5.StepFontColor = System.Drawing.Color.White;
this.ucStep5.StepForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(77)))), ((int)(((byte)(59)))));
this.ucStep5.StepIndex = 2;
this.ucStep5.Steps = new string[] {
"step1",
"step2",
"step3",
"step4",
"step5"};
this.ucStep5.StepWidth = 35;
this.ucStep5.TabIndex = 1;
//
// ucStep2 // ucStep2
// //
this.ucStep2.BackColor = System.Drawing.Color.Transparent; this.ucStep2.BackColor = System.Drawing.Color.Transparent;
...@@ -59,28 +125,6 @@ ...@@ -59,28 +125,6 @@
this.ucStep2.StepWidth = 35; this.ucStep2.StepWidth = 35;
this.ucStep2.TabIndex = 1; this.ucStep2.TabIndex = 1;
// //
// ucStep1
//
this.ucStep1.BackColor = System.Drawing.Color.Transparent;
this.ucStep1.Font = new System.Drawing.Font("微软雅黑", 12F);
this.ucStep1.ImgCompleted = ((System.Drawing.Image)(resources.GetObject("ucStep1.ImgCompleted")));
this.ucStep1.LineWidth = 10;
this.ucStep1.Location = new System.Drawing.Point(29, 40);
this.ucStep1.Name = "ucStep1";
this.ucStep1.Size = new System.Drawing.Size(362, 77);
this.ucStep1.StepBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(189)))), ((int)(((byte)(189)))), ((int)(((byte)(189)))));
this.ucStep1.StepFontColor = System.Drawing.Color.White;
this.ucStep1.StepForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(77)))), ((int)(((byte)(59)))));
this.ucStep1.StepIndex = 2;
this.ucStep1.Steps = new string[] {
"step1",
"step2",
"step3",
"step4",
"step5"};
this.ucStep1.StepWidth = 35;
this.ucStep1.TabIndex = 2;
//
// ucStep3 // ucStep3
// //
this.ucStep3.BackColor = System.Drawing.Color.Transparent; this.ucStep3.BackColor = System.Drawing.Color.Transparent;
...@@ -103,71 +147,27 @@ ...@@ -103,71 +147,27 @@
this.ucStep3.StepWidth = 35; this.ucStep3.StepWidth = 35;
this.ucStep3.TabIndex = 2; this.ucStep3.TabIndex = 2;
// //
// ucStep4 // ucStep1
//
this.ucStep4.BackColor = System.Drawing.Color.Transparent;
this.ucStep4.Font = new System.Drawing.Font("微软雅黑", 12F);
this.ucStep4.ImgCompleted = null;
this.ucStep4.LineWidth = 10;
this.ucStep4.Location = new System.Drawing.Point(409, 133);
this.ucStep4.Name = "ucStep4";
this.ucStep4.Size = new System.Drawing.Size(362, 86);
this.ucStep4.StepBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(189)))), ((int)(((byte)(189)))), ((int)(((byte)(189)))));
this.ucStep4.StepFontColor = System.Drawing.Color.White;
this.ucStep4.StepForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(157)))), ((int)(((byte)(144)))));
this.ucStep4.StepIndex = 2;
this.ucStep4.Steps = new string[] {
"step1",
"step2",
"step3",
"step4",
"step5"};
this.ucStep4.StepWidth = 35;
this.ucStep4.TabIndex = 1;
//
// ucStep5
//
this.ucStep5.BackColor = System.Drawing.Color.Transparent;
this.ucStep5.Font = new System.Drawing.Font("微软雅黑", 12F);
this.ucStep5.ImgCompleted = null;
this.ucStep5.LineWidth = 10;
this.ucStep5.Location = new System.Drawing.Point(29, 225);
this.ucStep5.Name = "ucStep5";
this.ucStep5.Size = new System.Drawing.Size(742, 109);
this.ucStep5.StepBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(189)))), ((int)(((byte)(189)))), ((int)(((byte)(189)))));
this.ucStep5.StepFontColor = System.Drawing.Color.White;
this.ucStep5.StepForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(77)))), ((int)(((byte)(59)))));
this.ucStep5.StepIndex = 2;
this.ucStep5.Steps = new string[] {
"step1",
"step2",
"step3",
"step4",
"step5"};
this.ucStep5.StepWidth = 35;
this.ucStep5.TabIndex = 1;
//
// ucStep6
// //
this.ucStep6.BackColor = System.Drawing.Color.Transparent; this.ucStep1.BackColor = System.Drawing.Color.Transparent;
this.ucStep6.Font = new System.Drawing.Font("微软雅黑", 12F); this.ucStep1.Font = new System.Drawing.Font("微软雅黑", 12F);
this.ucStep6.ImgCompleted = null; this.ucStep1.ImgCompleted = ((System.Drawing.Image)(resources.GetObject("ucStep1.ImgCompleted")));
this.ucStep6.LineWidth = 10; this.ucStep1.LineWidth = 10;
this.ucStep6.Location = new System.Drawing.Point(29, 340); this.ucStep1.Location = new System.Drawing.Point(29, 40);
this.ucStep6.Name = "ucStep6"; this.ucStep1.Name = "ucStep1";
this.ucStep6.Size = new System.Drawing.Size(742, 109); this.ucStep1.Size = new System.Drawing.Size(362, 77);
this.ucStep6.StepBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(189)))), ((int)(((byte)(189)))), ((int)(((byte)(189))))); this.ucStep1.StepBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(189)))), ((int)(((byte)(189)))), ((int)(((byte)(189)))));
this.ucStep6.StepFontColor = System.Drawing.Color.White; this.ucStep1.StepFontColor = System.Drawing.Color.White;
this.ucStep6.StepForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(157)))), ((int)(((byte)(144))))); this.ucStep1.StepForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(77)))), ((int)(((byte)(59)))));
this.ucStep6.StepIndex = 2; this.ucStep1.StepIndex = 2;
this.ucStep6.Steps = new string[] { this.ucStep1.Steps = new string[] {
"step1", "step1",
"step2", "step2",
"step3", "step3",
"step4", "step4",
"step5"}; "step5"};
this.ucStep6.StepWidth = 35; this.ucStep1.StepWidth = 35;
this.ucStep6.TabIndex = 1; this.ucStep1.TabIndex = 2;
// //
// UCTestStep // UCTestStep
// //
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
this.Controls.Add(this.ucStep3); this.Controls.Add(this.ucStep3);
this.Controls.Add(this.ucStep1); this.Controls.Add(this.ucStep1);
this.Name = "UCTestStep"; this.Name = "UCTestStep";
this.Size = new System.Drawing.Size(811, 526); this.Size = new System.Drawing.Size(1280, 526);
this.ResumeLayout(false); this.ResumeLayout(false);
} }
......
HZH_Controls/Test/UC/UCTestStep.resx
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="ucStep1.ImgCompleted" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="ucStep3.ImgCompleted" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAACvSURBVEhL7ZLRDYMwDEQzQkfoaB2hIzBCNygbMEpHSu/IGZEIRa1x+4F40kmWY78AIp0ci5zz YQUAAACvSURBVEhL7ZLRDYMwDEQzQkfoaB2hIzBCNygbMEpHSu/IGZEIRa1x+4F40kmWY78AIp0ci5zz
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
b1p1tZEYIvwEAAAAAElFTkSuQmCC b1p1tZEYIvwEAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<data name="ucStep3.ImgCompleted" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="ucStep1.ImgCompleted" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAACvSURBVEhL7ZLRDYMwDEQzQkfoaB2hIzBCNygbMEpHSu/IGZEIRa1x+4F40kmWY78AIp0ci5zz YQUAAACvSURBVEhL7ZLRDYMwDEQzQkfoaB2hIzBCNygbMEpHSu/IGZEIRa1x+4F40kmWY78AIp0ci5zz
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!