Merge pull request #14 from LeoYoungHub/master

Merge pull request #1 from kwwwvagaa/master

HZH_Controls/HZH_Controls/Controls/Step/UCStep.cs

@@ -131,7 +131,7 @@ namespace HZH_Controls.Controls
 			get { return m_steps; }
 			set
 			{
-                if (m_steps == null || m_steps.Length <= 1)
+				if (m_steps == null || m_steps.Length < 1)
 					return;
 				m_steps = value;
 				Refresh();
@@ -271,9 +271,11 @@ namespace HZH_Controls.Controls
 				}
 
 				int intSplitWidth = 20;
+				if (m_steps.Length > 1)
+				{
 					intSplitWidth = (this.Width - m_steps.Length - (m_steps.Length * m_stepWidth) - intRight - intLeft) / (m_steps.Length - 1);
-                if (intSplitWidth < 20)
-                    intSplitWidth = 20;
+				}
+				
 				m_lstCacheRect = new List<Rectangle>();
 				for (int i = 0; i < m_steps.Length; i++)
 				{

HZH_Controls/Test/UC/UCTestStep.Designer.cs

@@ -95,11 +95,7 @@
 			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"};
+        "step1"};
 			this.ucStep5.StepWidth = 35;
 			this.ucStep5.TabIndex = 1;
 			// 

HZH_Controls/Test/UC/UCTestStep.resx

@@ -120,20 +120,20 @@
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="ucStep3.ImgCompleted" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAACvSURBVEhL7ZLRDYMwDEQzQkfoaB2hIzBCNygbMEpHSu/IGZEIRa1x+4F40kmWY78AIp0ci5zz
-        VWU8kI/IC7moFYfkRtwlFCETrQ2DRvxAQjmftmXUiB9I/HIMdb8fzxG/HOHyU62K1XnLV3KD9fI2rNVr
-        uWukDwaHMl8xX6JsyW9a/wwsrP9ng+L9cgOLj7LfxSc3KCieTfbJDYqKryJGblBYvDOxcoPin8lP/kBK
-        b1p1tZEYIvwEAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAK9JREFUSEvt
+        ktENgzAMRDNCR+hoHaEjMEI3KBswSkdK78gZkQhFrXH7gXjSSZZjvwAinRyLnPNVZTyQj8gLuagVh+RG
+        3CUUIROtDYNG/EBCOZ+2ZdSIH0j8cgx1vx/PEb8c4fJTrYrVectXcoP18jas1Wu5a6QPBocyXzFfomzJ
+        b1r/DCys/2eD4v1yA4uPst/FJzcoKJ5N9skNioqvIkZuUFi8M7Fyg+KfyU/+QEpvWnW1kRgi/AQAAAAA
+        SUVORK5CYII=
 </value>
   </data>
   <data name="ucStep1.ImgCompleted" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAACvSURBVEhL7ZLRDYMwDEQzQkfoaB2hIzBCNygbMEpHSu/IGZEIRa1x+4F40kmWY78AIp0ci5zz
-        VWU8kI/IC7moFYfkRtwlFCETrQ2DRvxAQjmftmXUiB9I/HIMdb8fzxG/HOHyU62K1XnLV3KD9fI2rNVr
-        uWukDwaHMl8xX6JsyW9a/wwsrP9ng+L9cgOLj7LfxSc3KCieTfbJDYqKryJGblBYvDOxcoPin8lP/kBK
-        b1p1tZEYIvwEAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAK9JREFUSEvt
+        ktENgzAMRDNCR+hoHaEjMEI3KBswSkdK78gZkQhFrXH7gXjSSZZjvwAinRyLnPNVZTyQj8gLuagVh+RG
+        3CUUIROtDYNG/EBCOZ+2ZdSIH0j8cgx1vx/PEb8c4fJTrYrVectXcoP18jas1Wu5a6QPBocyXzFfomzJ
+        b1r/DCys/2eD4v1yA4uPst/FJzcoKJ5N9skNioqvIkZuUFi8M7Fyg+KfyU/+QEpvWnW1kRgi/AQAAAAA
+        SUVORK5CYII=
 </value>
   </data>
 </root>
\ No newline at end of file