Merge pull request #62 from ericksson/bugfix_1190899

[Fix for #1190899] - Clicking outside canvas with Move Selected Pixels and Gradient tools.
PintaProject · Jun 20, 2013 · bb1fa28 · bb1fa28
2 parents b8e33e6 + 65b29df
commit bb1fa28
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/Pinta.Tools/Tools/BaseTransformTool.cs b/Pinta.Tools/Tools/BaseTransformTool.cs
@@ -70,10 +70,14 @@ protected virtual void OnFinishTransform()
 		                                     Gtk.ButtonPressEventArgs args,
 		                                     Cairo.PointD point)
 		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+
 			if(is_dragging || is_rotating)
 				return;
 
 			original_point = point;
+			if (!doc.Workspace.PointInCanvas(point))
+				return;
 
 			if(args.Event.Button == GtkExtensions.MouseRightButton)
 			{

diff --git a/Pinta.Tools/Tools/GradientTool.cs b/Pinta.Tools/Tools/GradientTool.cs
@@ -76,6 +76,9 @@ protected override void OnMouseDown (Gtk.DrawingArea canvas, Gtk.ButtonPressEven
 				return;
 
 			startpoint = point;
+			if (!doc.Workspace.PointInCanvas(point))
+				return;
+
 			tracking = true;
 			button = args.Event.Button;
 			undo_surface = doc.CurrentUserLayer.Surface.Clone ();