github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-20 05:23:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stability fixes for Bug #3052665

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@869 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2010-08-25 10:57:39 +00:00
commit 387ffad3cf
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
GreenshotEditor/Drawing/Surface.cs
View file

@ -370,22 +370,23 @@ namespace Greenshot.Drawing {
// } // }
#endregion #endregion
void ApplyCrop() { bool ApplyCrop(Rectangle cropRectangle) {
Rectangle r = cropContainer.Bounds; cropRectangle = Helpers.GuiRectangle.GetGuiRectangle(cropRectangle.Left, cropRectangle.Top, cropRectangle.Width, cropRectangle.Height);
r = Helpers.GuiRectangle.GetGuiRectangle(r.Left, r.Top, r.Width, r.Height); if (cropRectangle.Left < 0) cropRectangle = new Rectangle(0, cropRectangle.Top, cropRectangle.Width + cropRectangle.Left, cropRectangle.Height);
if (r.Left < 0) r = new Rectangle(0, r.Top, r.Width + r.Left, r.Height); if (cropRectangle.Top < 0) cropRectangle = new Rectangle(cropRectangle.Left, 0, cropRectangle.Width, cropRectangle.Height + cropRectangle.Top);
if (r.Top < 0) r = new Rectangle(r.Left, 0, r.Width, r.Height + r.Top); if (cropRectangle.Left + cropRectangle.Width > Width) cropRectangle = new Rectangle(cropRectangle.Left, cropRectangle.Top, Width - cropRectangle.Left, cropRectangle.Height);
if (r.Left + r.Width > Width) r = new Rectangle(r.Left, r.Top, Width - r.Left, r.Height); if (cropRectangle.Top + cropRectangle.Height > Height) cropRectangle = new Rectangle(cropRectangle.Left, cropRectangle.Top, cropRectangle.Width, Height - cropRectangle.Top);
if (r.Top + r.Height > Height) r = new Rectangle(r.Left, r.Top, r.Width, Height - r.Top);
if (r.Height > 0 && r.Width > 0) { if (cropRectangle.Height > 0 && cropRectangle.Width > 0) {
// we should not forget to Dispose the images!! // we should not forget to Dispose the images!!
using (Bitmap tmpImage = ((Bitmap)originalImage).Clone(r, originalImage.PixelFormat)) { using (Bitmap tmpImage = ((Bitmap)originalImage).Clone(cropRectangle, originalImage.PixelFormat)) {
tmpImage.SetResolution(originalImage.HorizontalResolution, originalImage.VerticalResolution); tmpImage.SetResolution(originalImage.HorizontalResolution, originalImage.VerticalResolution);
SetImage(tmpImage); SetImage(tmpImage);
elements.MoveBy(-r.Left, -r.Top); elements.MoveBy(-cropRectangle.Left, -cropRectangle.Top);
} }
return true;
} }
return false;
} }
void SurfaceMouseDown(object sender, MouseEventArgs e) { void SurfaceMouseDown(object sender, MouseEventArgs e) {
@ -616,11 +617,11 @@ namespace Greenshot.Drawing {
List<DrawableContainer> selectedDCs = new List<DrawableContainer>(selectedElements); List<DrawableContainer> selectedDCs = new List<DrawableContainer>(selectedElements);
foreach(DrawableContainer dc in selectedDCs){ foreach(DrawableContainer dc in selectedDCs){
if(dc.Equals(cropContainer)){ if(dc.Equals(cropContainer)){
if(confirm) {
ApplyCrop();
}
DrawingMode = DrawingModes.None; DrawingMode = DrawingModes.None;
RemoveElement(cropContainer); RemoveElement(cropContainer);
if(confirm) {
ApplyCrop(cropContainer.Bounds);
}
cropContainer.Dispose(); cropContainer.Dispose();
} }
} }