liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue 2012: fixed cropwindow gripping bug

Browse Source
This commit is contained in:
torger
2013-10-31 14:35:22 +01:00
parent cec2e9439e
commit 92e5f98d59
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtgui/cropwindow.cc
View File

@@ -543,28 +543,32 @@ bool CropWindow::onArea (CursorArea a, int x, int y) {
x1>cropHandler.cropParams.x+CROPRESIZEBORDER && x1>cropHandler.cropParams.x+CROPRESIZEBORDER &&
x1<cropHandler.cropParams.x+cropHandler.cropParams.w-1-CROPRESIZEBORDER && x1<cropHandler.cropParams.x+cropHandler.cropParams.w-1-CROPRESIZEBORDER &&
y1>cropHandler.cropParams.y-CROPRESIZEBORDER && y1>cropHandler.cropParams.y-CROPRESIZEBORDER &&
y1<cropHandler.cropParams.y+CROPRESIZEBORDER; y1<cropHandler.cropParams.y+CROPRESIZEBORDER &&
y>=ypos+imgY;
case CropBottom: case CropBottom:
translateCoord (x, y, x1, y1); translateCoord (x, y, x1, y1);
return cropHandler.cropParams.enabled && return cropHandler.cropParams.enabled &&
x1>cropHandler.cropParams.x+CROPRESIZEBORDER && x1>cropHandler.cropParams.x+CROPRESIZEBORDER &&
x1<cropHandler.cropParams.x+cropHandler.cropParams.w-1-CROPRESIZEBORDER && x1<cropHandler.cropParams.x+cropHandler.cropParams.w-1-CROPRESIZEBORDER &&
y1>cropHandler.cropParams.y+cropHandler.cropParams.h-1-CROPRESIZEBORDER && y1>cropHandler.cropParams.y+cropHandler.cropParams.h-1-CROPRESIZEBORDER &&
y1<cropHandler.cropParams.y+cropHandler.cropParams.h-1+CROPRESIZEBORDER; y1<cropHandler.cropParams.y+cropHandler.cropParams.h-1+CROPRESIZEBORDER &&
y<ypos+imgY+imgH;
case CropLeft: case CropLeft:
translateCoord (x, y, x1, y1); translateCoord (x, y, x1, y1);
return cropHandler.cropParams.enabled && return cropHandler.cropParams.enabled &&
y1>cropHandler.cropParams.y+CROPRESIZEBORDER && y1>cropHandler.cropParams.y+CROPRESIZEBORDER &&
y1<cropHandler.cropParams.y+cropHandler.cropParams.h-1-CROPRESIZEBORDER && y1<cropHandler.cropParams.y+cropHandler.cropParams.h-1-CROPRESIZEBORDER &&
x1>cropHandler.cropParams.x-CROPRESIZEBORDER && x1>cropHandler.cropParams.x-CROPRESIZEBORDER &&
x1<cropHandler.cropParams.x+CROPRESIZEBORDER; x1<cropHandler.cropParams.x+CROPRESIZEBORDER &&
x>=xpos+imgX;
case CropRight: case CropRight:
translateCoord (x, y, x1, y1); translateCoord (x, y, x1, y1);
return cropHandler.cropParams.enabled && return cropHandler.cropParams.enabled &&
y1>cropHandler.cropParams.y+CROPRESIZEBORDER && y1>cropHandler.cropParams.y+CROPRESIZEBORDER &&
y1<cropHandler.cropParams.y+cropHandler.cropParams.h-1-CROPRESIZEBORDER && y1<cropHandler.cropParams.y+cropHandler.cropParams.h-1-CROPRESIZEBORDER &&
x1>cropHandler.cropParams.x+cropHandler.cropParams.w-1-CROPRESIZEBORDER && x1>cropHandler.cropParams.x+cropHandler.cropParams.w-1-CROPRESIZEBORDER &&
x1<cropHandler.cropParams.x+cropHandler.cropParams.w-1+CROPRESIZEBORDER; x1<cropHandler.cropParams.x+cropHandler.cropParams.w-1+CROPRESIZEBORDER &&
x<xpos+imgX+imgW;
case CropInside: case CropInside:
translateCoord (x, y, x1, y1); translateCoord (x, y, x1, y1);
return cropHandler.cropParams.enabled && return cropHandler.cropParams.enabled &&