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

Added info to track bugs like #3592758 better, we should use this more often.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2362 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-12-07 10:57:48 +00:00
parent c514695637
commit d7af595d0d
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Greenshot/Drawing/Surface.cs
View file

@ -1013,13 +1013,23 @@ namespace Greenshot.Drawing {
public bool ApplyCrop(Rectangle cropRectangle) {
if (isCropPossible(ref cropRectangle)) {
Rectangle imageRectangle = new Rectangle(Point.Empty, Image.Size);
// we should not forget to Dispose the images!!
Bitmap tmpImage = ImageHelper.CloneArea(Image, cropRectangle, PixelFormat.DontCare);
Bitmap tmpImage;
// Make sure we have information, this this fails
try {
tmpImage = ImageHelper.CloneArea(Image, cropRectangle, PixelFormat.DontCare);
} catch (Exception ex) {
ex.Data.Add("CropRectangle", cropRectangle);
ex.Data.Add("Width", Image.Width);
ex.Data.Add("Height", Image.Height);
ex.Data.Add("Pixelformat", Image.PixelFormat);
throw ex;
}
Point offset = new Point(-cropRectangle.Left, -cropRectangle.Top);
// Make undoable
MakeUndoable(new SurfaceBackgroundChangeMemento(this, offset), false);
// Do not dispose otherwise we can't undo the image!
SetImage(tmpImage, false);
elements.MoveBy(offset.X, offset.Y);
if (surfaceSizeChanged != null && !imageRectangle.Equals(new Rectangle(Point.Empty, tmpImage.Size))) {
@ -1439,12 +1449,12 @@ namespace Greenshot.Drawing {
public void ConfirmSelectedConfirmableElements(bool confirm){
// create new collection so that we can iterate safely (selectedElements might change due with confirm/cancel)
List<IDrawableContainer> selectedDCs = new List<IDrawableContainer>(selectedElements);
foreach(IDrawableContainer dc in selectedDCs){
if(dc.Equals(cropContainer)){
foreach (IDrawableContainer dc in selectedDCs){
if (dc.Equals(cropContainer)){
DrawingMode = DrawingModes.None;
// No undo memento for the cropcontainer itself, only for the effect
RemoveElement(cropContainer, false);
if(confirm) {
if (confirm) {
ApplyCrop(cropContainer.Bounds);
}
cropContainer.Dispose();