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

Hovered edit object wasn't dragged if inside a red crop's rectangle

Browse Source 
Fix issue #5415
This commit is contained in:
Hombre 2019-08-18 01:54:31 +02:00
parent f7ec852e05
commit f5a18f6248
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rtgui/cropwindow.cc
View File

@ -404,6 +404,26 @@ void CropWindow::buttonPress (int button, int type, int bstate, int x, int y)
action_y = 0; action_y = 0;
needRedraw = true; needRedraw = true;
} }
} else if (iarea->getToolMode () == TMHand
&& editSubscriber
&& cropgl
&& cropgl->inImageArea(iarea->posImage.x, iarea->posImage.y)
&& editSubscriber->getEditingType() == ET_OBJECTS
&& iarea->getObject() >= 0
)
{
needRedraw = editSubscriber->button1Pressed(bstate);
if (editSubscriber->isDragging()) {
state = SEditDrag1;
} else if (editSubscriber->isPicking()) {
state = SEditPick1;
pickedObject = iarea->getObject();
pickModifierKey = bstate;
}
press_x = x;
press_y = y;
action_x = 0;
action_y = 0;
} else if (onArea (CropTopLeft, x, y)) { } else if (onArea (CropTopLeft, x, y)) {
state = SResizeTL; state = SResizeTL;
press_x = x; press_x = x;
@ -477,7 +497,7 @@ void CropWindow::buttonPress (int button, int type, int bstate, int x, int y)
cropgl->cropInit (cropHandler.cropParams->x, cropHandler.cropParams->y, cropHandler.cropParams->w, cropHandler.cropParams->h); cropgl->cropInit (cropHandler.cropParams->x, cropHandler.cropParams->y, cropHandler.cropParams->w, cropHandler.cropParams->h);
} else if (iarea->getToolMode () == TMHand) { } else if (iarea->getToolMode () == TMHand) {
if (editSubscriber) { if (editSubscriber) {
if ((cropgl && cropgl->inImageArea(iarea->posImage.x, iarea->posImage.y) && (editSubscriber->getEditingType() == ET_PIPETTE && (bstate & GDK_CONTROL_MASK))) || editSubscriber->getEditingType() == ET_OBJECTS) { if ((cropgl && cropgl->inImageArea(iarea->posImage.x, iarea->posImage.y) && editSubscriber->getEditingType() == ET_PIPETTE && (bstate & GDK_CONTROL_MASK))) {
needRedraw = editSubscriber->button1Pressed(bstate); needRedraw = editSubscriber->button1Pressed(bstate);
if (editSubscriber->isDragging()) { if (editSubscriber->isDragging()) {
state = SEditDrag1; state = SEditDrag1;
@ -492,7 +512,7 @@ void CropWindow::buttonPress (int button, int type, int bstate, int x, int y)
action_y = 0; action_y = 0;
} }
} }
if (state != SEditDrag1) { if (state != SEditDrag1 && state != SEditPick1) {
state = SCropImgMove; state = SCropImgMove;
press_x = x; press_x = x;
press_y = y; press_y = y;