From eb8a9e5a90f8f5b142eb5e7d296d3dd6eaf7ca34 Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Sun, 22 May 2016 23:43:19 +0300
Subject: [PATCH] Order step shapes before draw

---
 ShareX.ScreenCaptureLib/Forms/RectangleRegionForm.cs |  2 ++
 ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs       | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/ShareX.ScreenCaptureLib/Forms/RectangleRegionForm.cs b/ShareX.ScreenCaptureLib/Forms/RectangleRegionForm.cs
index d5147f7d4..8aa8653a8 100644
--- a/ShareX.ScreenCaptureLib/Forms/RectangleRegionForm.cs
+++ b/ShareX.ScreenCaptureLib/Forms/RectangleRegionForm.cs
@@ -211,6 +211,8 @@ protected override void Draw(Graphics g)
                 effectShape.OnDraw(g);
             }
 
+            ShapeManager.OrderStepShapes();
+
             // Draw drawing shapes
             foreach (BaseDrawingShape drawingShape in ShapeManager.DrawingShapes)
             {
diff --git a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
index e844dfe94..d25ea4d99 100644
--- a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
+++ b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
@@ -1315,6 +1315,16 @@ public void ResumeForm()
             form.Resume();
         }
 
+        public void OrderStepShapes()
+        {
+            int i = 1;
+
+            foreach (StepDrawingShape shape in Shapes.OfType<StepDrawingShape>())
+            {
+                shape.Number = i++;
+            }
+        }
+
         private void OnCurrentShapeChanged(BaseShape shape)
         {
             if (CurrentShapeChanged != null)