Fixed serialization issues with the StepLabelContainer and the SpeechbubbleContainer, they should now be in the correct shape/location when loading from the .greenshot file.

Greenshot/Drawing/SpeechbubbleContainer.cs

@@ -27,6 +27,7 @@ using System;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Text;
+using System.Runtime.Serialization;
 using System.Windows.Forms;
 
 namespace Greenshot.Drawing {
@@ -35,7 +36,34 @@ namespace Greenshot.Drawing {
 	/// </summary>
 	[Serializable]
 	public class SpeechbubbleContainer : TextContainer {
-		public SpeechbubbleContainer(Surface parent) : base(parent) {
+
+		#region TargetGripper serializing code
+		// Only used for serializing the TargetGripper location
+		private Point _storedTargetGripperLocation;
+
+		/// <summary>
+		/// Store the current location of the target gripper
+		/// </summary>
+		/// <param name="context"></param>
+		[OnSerializing]
+		private void SetValuesOnSerializing(StreamingContext context) {
+			if (TargetGripper != null) {
+				_storedTargetGripperLocation = TargetGripper.Location;
+			}
+		}
+
+		/// <summary>
+		/// Restore the target gripper
+		/// </summary>
+		/// <param name="context"></param>
+		[OnDeserialized]
+		private void SetValuesOnDeserialized(StreamingContext context) {
+			InitTargetGripper(Color.Green, _storedTargetGripperLocation);
+		}
+		#endregion
+
+		public SpeechbubbleContainer(Surface parent)
+			: base(parent) {
 		}
 
 		/// <summary>

Greenshot/Drawing/StepLabelContainer.cs

@@ -48,25 +48,52 @@ namespace Greenshot.Drawing {
 			InitContent();
 		}
 
+		#region Number serializing
+		// Used to store the number of this label, so when deserializing it can be placed back to the StepLabels list in the right location
+		private int _number;
+		public int Number {
+			get {
+				return _number;
+			}
+			set {
+				_number = value;
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the counter before serializing
+		/// </summary>
+		/// <param name="context"></param>
+		[OnSerializing]
+		private void SetValuesOnSerializing(StreamingContext context) {
+			if (Parent != null) {
+				Number = ((Surface)Parent).CountStepLabels(this);
+			}
+		}
+		#endregion
+
+		/// <summary>
+		/// Restore values that don't serialize
+		/// </summary>
+		/// <param name="context"></param>
 		[OnDeserialized]
-		private void OnDeserialized(StreamingContext context) {
+		private void SetValuesOnDeserialized(StreamingContext context) {
 			_stringFormat = new StringFormat();
 			_stringFormat.Alignment = StringAlignment.Center;
 			_stringFormat.LineAlignment = StringAlignment.Center;
 		}
 
 		/// <summary>
-		/// Make sure the StepLabel is addded to the parent after deserializing
-		/// by removing it from the current parent and added it to the new
+		/// Add the StepLabel to the parent
 		/// </summary>
 		/// <param name="newParent"></param>
 		protected override void SwitchParent(Surface newParent) {
 			if (Parent != null) {
-				Parent.RemoveStepLabel(this);
+				((Surface)Parent).RemoveStepLabel(this);
 			}
 			base.SwitchParent(newParent);
-			if (Parent != null) {
-				Parent.AddStepLabel(this);
+			if (newParent != null) {
+				((Surface)Parent).AddStepLabel(this);
 			}
 		}
 
@@ -107,7 +134,7 @@ namespace Greenshot.Drawing {
 		/// Make sure this element is no longer referenced from the surface
 		/// </summary>
 		public override void Dispose() {
-			Parent.RemoveStepLabel(this);
+			((Surface)Parent).RemoveStepLabel(this);
 			base.Dispose();
 		}
 
@@ -130,7 +157,7 @@ namespace Greenshot.Drawing {
 			graphics.CompositingQuality = CompositingQuality.HighQuality;
 			graphics.PixelOffsetMode = PixelOffsetMode.None;
 			graphics.TextRenderingHint = TextRenderingHint.AntiAliasGridFit;
-			string text = Parent.CountStepLabels(this).ToString();
+			string text = ((Surface)Parent).CountStepLabels(this).ToString();
 			Rectangle rect = GuiRectangle.GetGuiRectangle(Left, Top, Width, Height);
 			Color fillColor = GetFieldValueAsColor(FieldType.FILL_COLOR);
 			Color lineColor = GetFieldValueAsColor(FieldType.LINE_COLOR);

Greenshot/Drawing/Surface.cs

@@ -208,24 +208,23 @@ namespace Greenshot.Drawing {
 		/// <summary>
 		/// all stepLabels for the surface, needed with serialization
 		/// </summary>
-		private List<IDrawableContainer> _stepLabels = new List<IDrawableContainer>();
+		private List<StepLabelContainer> _stepLabels = new List<StepLabelContainer>();
 
-		public void AddStepLabel(IDrawableContainer stepLabel) {
+		public void AddStepLabel(StepLabelContainer stepLabel) {
 			_stepLabels.Add(stepLabel);
 		}
-		public void RemoveStepLabel(IDrawableContainer stepLabel) {
+		public void RemoveStepLabel(StepLabelContainer stepLabel) {
 			_stepLabels.Remove(stepLabel);
 		}
 
 		/// <summary>
-		/// Count all the steplabels in the surface, up to the supplied one
+		/// Count all the VISIBLE steplabels in the surface, up to the supplied one
 		/// </summary>
 		/// <param name="stopAtContainer">can be null, if not the counting stops here</param>
 		/// <returns>number of steplabels before the supplied container</returns>
 		public int CountStepLabels(IDrawableContainer stopAtContainer) {
 			int number = 1;
-			foreach (var drawableContainer in _stepLabels) {
-				var possibleThis = (StepLabelContainer) drawableContainer;
+			foreach (var possibleThis in _stepLabels) {
 				if (possibleThis == stopAtContainer) {
 					break;
 				}
@@ -631,6 +630,10 @@ namespace Greenshot.Drawing {
 				BinaryFormatter binaryRead = new BinaryFormatter();
 				DrawableContainerList loadedElements = (DrawableContainerList) binaryRead.Deserialize(streamRead);
 				loadedElements.Parent = this;
+				// Make sure the steplabels are sorted accoring to their number
+				_stepLabels.Sort(delegate(StepLabelContainer p1, StepLabelContainer p2) {
+					return p1.Number.CompareTo(p2.Number);
+				});
 				DeselectAllElements();
 				AddElements(loadedElements);
 				SelectElements(loadedElements);

GreenshotPlugin/Interfaces/Generic.cs

@@ -198,9 +198,5 @@ namespace Greenshot.Plugin {
 			get;
 			set;
 		}
-
-		void AddStepLabel(IDrawableContainer stepLabel);
-		void RemoveStepLabel(IDrawableContainer stepLabel);
-		int CountStepLabels(IDrawableContainer stopCountingOnStepLabel);
 	}
 }