Zoom for the editor (Feature-84)

Greenshot/Drawing/Adorners/AbstractAdorner.cs

@@ -116,6 +116,18 @@ public virtual Rectangle Bounds
 			}
 		}
 
+		/// <summary>
+		/// Return the bounds of the Adorner as displayed on the parent Surface
+		/// </summary>
+		protected virtual Rectangle BoundsOnSurface
+		{
+			get
+			{
+				Point displayLocation = Owner.Parent.ToSurfaceCoordinates(Location);
+				return new Rectangle(displayLocation.X - _size.Width / 2, displayLocation.Y - _size.Height / 2, _size.Width, _size.Height);
+			}
+		}
+
 		/// <summary>
 		/// The adorner is active if the edit status is not idle or undrawn
 		/// </summary>

Greenshot/Drawing/Adorners/MoveAdorner.cs

@@ -142,7 +142,7 @@ public override void Paint(PaintEventArgs paintEventArgs)
 		{
 			Graphics targetGraphics = paintEventArgs.Graphics;
 
-			var bounds = Bounds;
+			var bounds = BoundsOnSurface;
 			GraphicsState state = targetGraphics.Save();
 
 			targetGraphics.SmoothingMode = SmoothingMode.None;

Greenshot/Drawing/Adorners/ResizeAdorner.cs

@@ -169,7 +169,7 @@ public override void Paint(PaintEventArgs paintEventArgs)
 		{
 			Graphics targetGraphics = paintEventArgs.Graphics;
 
-			var bounds = Bounds;
+			var bounds = BoundsOnSurface;
 			GraphicsState state = targetGraphics.Save();
 
 			targetGraphics.SmoothingMode = SmoothingMode.None;

Greenshot/Drawing/Adorners/TargetAdorner.cs

@@ -61,26 +61,26 @@ public override void MouseMove(object sender, MouseEventArgs mouseEventArgs)
 
 			Owner.Invalidate();
 			Point newGripperLocation = new Point(mouseEventArgs.X, mouseEventArgs.Y);
-			Rectangle surfaceBounds = new Rectangle(0, 0, Owner.Parent.Width, Owner.Parent.Height);
+			Rectangle imageBounds = new Rectangle(0, 0, Owner.Parent.Image.Width, Owner.Parent.Image.Height);
 			// Check if gripper inside the parent (surface), if not we need to move it inside
 			// This was made for BUG-1682
-			if (!surfaceBounds.Contains(newGripperLocation))
+			if (!imageBounds.Contains(newGripperLocation))
 			{
-				if (newGripperLocation.X > surfaceBounds.Right)
+				if (newGripperLocation.X > imageBounds.Right)
 				{
-					newGripperLocation.X = surfaceBounds.Right - 5;
+					newGripperLocation.X = imageBounds.Right - 5;
 				}
-				if (newGripperLocation.X < surfaceBounds.Left)
+				if (newGripperLocation.X < imageBounds.Left)
 				{
-					newGripperLocation.X = surfaceBounds.Left;
+					newGripperLocation.X = imageBounds.Left;
 				}
-				if (newGripperLocation.Y > surfaceBounds.Bottom)
+				if (newGripperLocation.Y > imageBounds.Bottom)
 				{
-					newGripperLocation.Y = surfaceBounds.Bottom - 5;
+					newGripperLocation.Y = imageBounds.Bottom - 5;
 				}
-				if (newGripperLocation.Y < surfaceBounds.Top)
+				if (newGripperLocation.Y < imageBounds.Top)
 				{
-					newGripperLocation.Y = surfaceBounds.Top;
+					newGripperLocation.Y = imageBounds.Top;
 				}
 			}
 
@@ -96,7 +96,7 @@ public override void Paint(PaintEventArgs paintEventArgs)
 		{
 			Graphics targetGraphics = paintEventArgs.Graphics;
 
-			var bounds = Bounds;
+			var bounds = BoundsOnSurface;
 			targetGraphics.FillRectangle(Brushes.Green, bounds.X, bounds.Y, bounds.Width, bounds.Height);
 		}
 

Greenshot/Drawing/CropContainer.cs

@@ -56,7 +56,15 @@ private void Init()
 		/// We need to override the DrawingBound, return a rectangle in the size of the image, to make sure this element is always draw
 		/// (we create a transparent brown over the complete picture)
 		/// </summary>
-		public override Rectangle DrawingBounds => new Rectangle(0,0,_parent?.Width??0, _parent?.Height ?? 0);
+		public override Rectangle DrawingBounds {
+			get {
+				if (_parent?.Image is Image image) {
+					return new Rectangle(0, 0, image.Width, image.Height);
+				} else {
+					return Rectangle.Empty;
+				}
+			}
+		}
 
 		public override void Draw(Graphics g, RenderMode rm) {
 			if (_parent == null)
@@ -67,17 +75,18 @@ private void Init()
             using Brush cropBrush = new SolidBrush(Color.FromArgb(100, 150, 150, 100));
             Rectangle cropRectangle = GuiRectangle.GetGuiRectangle(Left, Top, Width, Height);
             Rectangle selectionRect = new Rectangle(cropRectangle.Left - 1, cropRectangle.Top - 1, cropRectangle.Width + 1, cropRectangle.Height + 1);
+            Size imageSize = _parent.Image.Size;
 
             DrawSelectionBorder(g, selectionRect);
 
             // top
-            g.FillRectangle(cropBrush, new Rectangle(0, 0, _parent.Width, cropRectangle.Top));
+            g.FillRectangle(cropBrush, new Rectangle(0, 0, imageSize.Width, cropRectangle.Top));
             // left
             g.FillRectangle(cropBrush, new Rectangle(0, cropRectangle.Top, cropRectangle.Left, cropRectangle.Height));
             // right
-            g.FillRectangle(cropBrush, new Rectangle(cropRectangle.Left + cropRectangle.Width, cropRectangle.Top, _parent.Width - (cropRectangle.Left + cropRectangle.Width), cropRectangle.Height));
+            g.FillRectangle(cropBrush, new Rectangle(cropRectangle.Left + cropRectangle.Width, cropRectangle.Top, imageSize.Width - (cropRectangle.Left + cropRectangle.Width), cropRectangle.Height));
             // bottom
-            g.FillRectangle(cropBrush, new Rectangle(0, cropRectangle.Top + cropRectangle.Height, _parent.Width, _parent.Height - (cropRectangle.Top + cropRectangle.Height)));
+            g.FillRectangle(cropBrush, new Rectangle(0, cropRectangle.Top + cropRectangle.Height, imageSize.Width, imageSize.Height - (cropRectangle.Top + cropRectangle.Height)));
         }
 
 		public override bool HasContextMenu {

Greenshot/Drawing/DrawableContainer.cs

@@ -33,7 +33,6 @@
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Runtime.Serialization;
-using System.Windows.Forms;
 using GreenshotPlugin.IniFile;
 using GreenshotPlugin.Interfaces;
 using GreenshotPlugin.Interfaces.Drawing.Adorners;
@@ -298,34 +297,7 @@ public IList<IAdorner> Adorners
 
 		public virtual void Invalidate() {
 			if (Status != EditStatus.UNDRAWN) {
-				_parent?.Invalidate(DrawingBounds);
-			}
-		}
-
-		public void AlignToParent(HorizontalAlignment horizontalAlignment, VerticalAlignment verticalAlignment) {
-			if (_parent == null)
-			{
-				return;
-			}
-			int lineThickness = GetFieldValueAsInt(FieldType.LINE_THICKNESS);
-			if (horizontalAlignment == HorizontalAlignment.Left) {
-				Left = lineThickness/2;
-			}
-			if (horizontalAlignment == HorizontalAlignment.Right) {
-				Left = _parent.Width - Width - lineThickness/2;
-			}
-			if (horizontalAlignment == HorizontalAlignment.Center) {
-				Left = (_parent.Width / 2) - (Width / 2) - lineThickness/2;
-			}
-
-			if (verticalAlignment == VerticalAlignment.TOP) {
-				Top = lineThickness/2;
-			}
-			if (verticalAlignment == VerticalAlignment.BOTTOM) {
-				Top = _parent.Height - Height - lineThickness/2;
-			}
-			if (verticalAlignment == VerticalAlignment.CENTER) {
-				Top = (_parent.Height / 2) - (Height / 2) - lineThickness/2;
+				_parent?.InvalidateElements(DrawingBounds);
 			}
 		}
 

Greenshot/Drawing/DrawableContainerList.cs

@@ -235,6 +235,30 @@ public class DrawableContainerList : List<IDrawableContainer>, IDrawableContaine
 			return false;
 		}
 
+		/// <summary>
+		/// A rectangle containing DrawingBounds of all drawableContainers in this list,
+		/// or empty rectangle if nothing is there.
+		/// </summary>
+		public Rectangle DrawingBounds
+		{
+			get
+			{
+				if (Count == 0)
+				{
+					return Rectangle.Empty;
+				}
+				else
+				{
+					var result = this[0].DrawingBounds;
+					for (int i = 1; i < Count; i++)
+					{
+						result = Rectangle.Union(result, this[i].DrawingBounds);
+					}
+					return result;
+				}
+			}
+		}
+
 		/// <summary>
 		/// Triggers all elements in the list ot be redrawn.
 		/// </summary>
@@ -286,7 +310,7 @@ public class DrawableContainerList : List<IDrawableContainer>, IDrawableContaine
 			{
 				region = Rectangle.Union(region, dc.DrawingBounds);
 			}
-			Parent.Invalidate(region);
+			Parent.InvalidateElements(region);
 		}
 		/// <summary>
 		/// Indicates whether the given list of elements can be pulled up, 
@@ -523,9 +547,9 @@ public void PullElementsToTop(IDrawableContainerList elements)
 			}
 		}
 
-		public virtual void ShowContextMenu(MouseEventArgs e, ISurface surface)
+		public virtual void ShowContextMenu(MouseEventArgs e, ISurface iSurface)
 		{
-			if (!(surface is Surface))
+			if (!(iSurface is Surface surface))
 			{
 				return;
 			}
@@ -542,8 +566,7 @@ public virtual void ShowContextMenu(MouseEventArgs e, ISurface surface)
 				ContextMenuStrip menu = new ContextMenuStrip();
 				AddContextMenuItems(menu, surface);
 				if (menu.Items.Count > 0) {
-					// TODO: cast should be somehow avoided
-					menu.Show((Surface)surface, e.Location);
+					menu.Show(surface, surface.ToSurfaceCoordinates(e.Location));
 					while (true) {
 						if (menu.Visible) {
 							Application.DoEvents();

Greenshot/Drawing/FreehandContainer.cs

@@ -47,8 +47,8 @@ public class FreehandContainer : DrawableContainer {
 		/// Constructor
 		/// </summary>
 		public FreehandContainer(Surface parent) : base(parent) {
-			Width = parent.Width;
-			Height = parent.Height;
+			Width = parent.Image.Width;
+			Height = parent.Image.Height;
 			Top = 0;
 			Left = 0;
 		}
@@ -236,7 +236,14 @@ protected static void DrawSelectionBorder(Graphics graphics, Pen linePen, Graphi
 					int safetymargin = 10;
 					return new Rectangle(myBounds.Left + Left - (safetymargin+lineThickness), myBounds.Top + Top - (safetymargin+lineThickness), myBounds.Width + 2*(lineThickness+safetymargin), myBounds.Height + 2*(lineThickness+safetymargin));
 				}
-				return new Rectangle(0, 0, _parent?.Width??0, _parent?.Height?? 0);
+				if (_parent?.Image is Image image)
+				{
+					return new Rectangle(0, 0, image.Width, image.Height);
+				}
+				else
+				{
+					return Rectangle.Empty;
+				}
 			}
 		}