Merge remote-tracking branch 'remotes/origin/feature/BUG-1887_removed_grippers'

# Conflicts:
#	Greenshot/Drawing/DrawableContainer.cs
#	Greenshot/Drawing/SpeechbubbleContainer.cs

GreenshotPlugin/Interfaces/Drawing/Adorners/IAdorner.cs

@@ -0,0 +1,91 @@
+/*
+ * Greenshot - a free and open source screenshot tool
+ * Copyright (C) 2007-2015 Thomas Braun, Jens Klingen, Robin Krom
+ * 
+ * For more information see: http://getgreenshot.org/
+ * The Greenshot project is hosted on Sourceforge: http://sourceforge.net/projects/greenshot/
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 1 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace Greenshot.Plugin.Drawing.Adorners
+{
+	public interface IAdorner
+	{
+		/// <summary>
+		/// Returns if this adorner is active
+		/// </summary>
+		bool IsActive { get; }
+
+		/// <summary>
+		/// The current edit status, this is needed to locate the adorner to send events to
+		/// </summary>
+		EditStatus EditStatus { get; }
+
+		/// <summary>
+		/// The owner of this adorner
+		/// </summary>
+		IDrawableContainer Owner { get; }
+
+		/// <summary>
+		/// Is the current point "over" the Adorner?
+		/// If this is the case, the 
+		/// </summary>
+		/// <param name="point">Point to test</param>
+		/// <returns>true if so</returns>
+		bool HitTest(Point point);
+
+		/// <summary>
+		/// Handle the MouseDown event
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="mouseEventArgs">MouseEventArgs</param>
+		void MouseDown(object sender, MouseEventArgs mouseEventArgs);
+
+		/// <summary>
+		/// Handle the MouseUp event
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="mouseEventArgs">MouseEventArgs</param>
+		void MouseUp(object sender, MouseEventArgs mouseEventArgs);
+
+		/// <summary>
+		/// Handle the MouseMove event
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="mouseEventArgs">MouseEventArgs</param>
+		void MouseMove(object sender, MouseEventArgs mouseEventArgs);
+
+		/// <summary>
+		/// Gets the cursor that should be displayed for this behavior.
+		/// </summary>
+		Cursor Cursor { get; }
+
+		/// <summary>
+		/// Draw the adorner
+		/// </summary>
+		/// <param name="paintEventArgs">PaintEventArgs</param>
+		void Paint(PaintEventArgs paintEventArgs);
+
+		/// <summary>
+		/// Called if the owner is transformed
+		/// </summary>
+		/// <param name="matrix">Matrix</param>
+		void Transform(Matrix matrix);
+	}
+}

GreenshotPlugin/Interfaces/Drawing/Container.cs

@@ -24,6 +24,9 @@ using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
 using System.Windows.Forms;
 using System.ComponentModel;
+using System.Collections.Generic;
+using Greenshot.Plugin.Drawing.Adorners;
+using System.Runtime.Serialization;
 
 namespace Greenshot.Plugin.Drawing {
 	public enum RenderMode {EDIT, EXPORT};
@@ -73,7 +76,9 @@ namespace Greenshot.Plugin.Drawing {
 		Rectangle DrawingBounds {
 			get;
 		}
-		
+
+		void ApplyBounds(RectangleF newBounds);
+	
 		bool hasFilters {
 			get;
 		}
@@ -85,8 +90,6 @@ namespace Greenshot.Plugin.Drawing {
 		void AlignToParent(HorizontalAlignment horizontalAlignment, VerticalAlignment verticalAlignment);
 		void Invalidate();
 		bool ClickableAt(int x, int y);
-		void HideGrippers();
-		void ShowGrippers();
 		void MoveBy(int x, int y);
 		void Transform(Matrix matrix);
 		bool HandleMouseDown(int x, int y);
@@ -97,6 +100,11 @@ namespace Greenshot.Plugin.Drawing {
 		EditStatus DefaultEditMode {
 			get;
 		}
+
+		/// <summary>
+		/// Available adorners for the DrawableContainer
+		/// </summary>
+		IList<IAdorner> Adorners { get; }
 	}
 
 	public interface ITextContainer: IDrawableContainer {

GreenshotPlugin/Interfaces/Generic.cs

@@ -197,5 +197,7 @@ namespace Greenshot.Plugin {
 			get;
 			set;
 		}
+		int Width { get; }
+		int Height { get; }
 	}
 }