github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-19 13:10:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

This fixes a bug where the AutoCrop can't be undone, there is still a bug where a redo of a crop (auto or normal) doesn't update the bindings.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2310 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-11-24 10:29:39 +00:00
commit 3d62f9c279
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Greenshot/Drawing/Surface.cs
View file

@ -734,15 +734,19 @@ namespace Greenshot.Drawing {
public bool AutoCrop() { public bool AutoCrop() {
Rectangle cropRectangle = ImageHelper.FindAutoCropRectangle(Image, conf.AutoCropDifference); Rectangle cropRectangle = ImageHelper.FindAutoCropRectangle(Image, conf.AutoCropDifference);
if (isCropPossible(ref cropRectangle)) { if (isCropPossible(ref cropRectangle)) {
DrawingMode = DrawingModes.Crop;
cropContainer = new CropContainer(this);
cropContainer.Left = cropRectangle.X;
cropContainer.Top = cropRectangle.Y;
cropContainer.Width = cropRectangle.Width;
cropContainer.Height = cropRectangle.Height;
DeselectAllElements(); DeselectAllElements();
AddElement(cropContainer); // Maybe a bit obscure, but the following line creates a drop container
SelectElement(cropContainer); // It's available as "undrawnElement"
DrawingMode = DrawingModes.Crop;
undrawnElement.Left = cropRectangle.X;
undrawnElement.Top = cropRectangle.Y;
undrawnElement.Width = cropRectangle.Width;
undrawnElement.Height = cropRectangle.Height;
undrawnElement.Status = EditStatus.UNDRAWN;
AddElement(undrawnElement);
SelectElement(undrawnElement);
drawingElement = null;
undrawnElement = null;
return true; return true;
} }
return false; return false;
@ -970,7 +974,7 @@ namespace Greenshot.Drawing {
if (drawingElement == null && DrawingMode != DrawingModes.None) { if (drawingElement == null && DrawingMode != DrawingModes.None) {
if (undrawnElement == null) { if (undrawnElement == null) {
DeselectAllElements(); DeselectAllElements();
if(undrawnElement == null) { if (undrawnElement == null) {
CreateUndrawnElement(); CreateUndrawnElement();
} }
} }