From 62eb62a9c22ff8b38e3fc1751d5f99bf6702f5f7 Mon Sep 17 00:00:00 2001
From: Fyers <Fyers@web.de>
Date: Wed, 19 Sep 2018 18:35:58 +0200
Subject: [PATCH] moved StartingStepNumber from AnnotationOptions to
 ShapeManager

---
 ShareX.ScreenCaptureLib/Shapes/AnnotationOptions.cs | 1 -
 ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs      | 3 ++-
 ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs  | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ShareX.ScreenCaptureLib/Shapes/AnnotationOptions.cs b/ShareX.ScreenCaptureLib/Shapes/AnnotationOptions.cs
index 5a78a1e28..61a48c88b 100644
--- a/ShareX.ScreenCaptureLib/Shapes/AnnotationOptions.cs
+++ b/ShareX.ScreenCaptureLib/Shapes/AnnotationOptions.cs
@@ -83,7 +83,6 @@ public class AnnotationOptions
         public Color StepFillColor { get; set; } = PrimaryColor;
         public int StepFontSize { get; set; } = 18;
         public bool StepUseLetters { get; set; } = false;
-        public int StartingStepNumber { get; set; } = 1;
 
         // Sticker drawing
         public List<StickerPackInfo> StickerPacks = new List<StickerPackInfo>()
diff --git a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
index 75535b48e..755c82820 100644
--- a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
+++ b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
@@ -152,6 +152,7 @@ private set
         public bool IsCurrentHoverShapeValid => CurrentHoverShape != null && CurrentHoverShape.IsValidShape;
 
         public bool IsCurrentShapeTypeRegion => IsShapeTypeRegion(CurrentTool);
+        public int StartingStepNumber { get; set; } = 1;
 
         public bool IsCreating { get; set; }
         public bool IsMoving { get; set; }
@@ -1474,7 +1475,7 @@ private void UpdateNodes()
 
         public void OrderStepShapes()
         {
-            int i = AnnotationOptions.StartingStepNumber;
+            int i = StartingStepNumber;
 
             foreach (StepDrawingShape shape in Shapes.OfType<StepDrawingShape>())
             {
diff --git a/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs b/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs
index ee6244010..48aa3ace5 100644
--- a/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs
+++ b/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs
@@ -551,11 +551,10 @@ internal void CreateToolbar()
             tslnudStartingStepValue.Content.Maximum = 10000;
             tslnudStartingStepValue.Content.ValueChanged = (sender, e) =>
             {
-                AnnotationOptions.StartingStepNumber = (int)tslnudStartingStepValue.Content.Value;
+                StartingStepNumber = (int)tslnudStartingStepValue.Content.Value;
                 UpdateCurrentShape();
             };
             tsddbShapeOptions.DropDownItems.Add(tslnudStartingStepValue);
-            AnnotationOptions.StartingStepNumber = 1;
 
             tsmiStepUseLetters = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_UseLetters);
             tsmiStepUseLetters.Checked = false;
@@ -1315,7 +1314,7 @@ private void UpdateMenu()
             tsbHighlightColor.Image = ImageHelpers.CreateColorPickerIcon(AnnotationOptions.HighlightColor, new Rectangle(0, 0, 16, 16));
 
             tslnudStepFontSize.Content.Value = AnnotationOptions.StepFontSize;
-            tslnudStartingStepValue.Content.Value = AnnotationOptions.StartingStepNumber;
+            tslnudStartingStepValue.Content.Value = StartingStepNumber;
             tsmiStepUseLetters.Checked = AnnotationOptions.StepUseLetters;
 
             tsmiShadow.Checked = AnnotationOptions.Shadow;