Skip to content

刘韬 / HZH_Controls

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

step bug

1 个父辈 46dac587
全部展开
内嵌 并排
正在显示 3 个修改的文件 包含 7 行增加 和 7 行删除
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.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!