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

New candidate fix for #3862, modifier keys handled in cropwindow.cc

Browse Source
This commit is contained in:
Hombre
2017-05-09 20:02:08 +02:00
parent ddabcb2049
commit abd11da072
3 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtgui/cropwindow.cc
View File

@@ -444,8 +444,8 @@ 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);
} else if (iarea->getToolMode () == TMHand) {
if (editSubscriber) {
needRedraw = editSubscriber->button1Pressed(bstate);
if ((cropgl && cropgl->inImageArea(iarea->posImage.x, iarea->posImage.y) && (editSubscriber->getEditingType() == ET_PIPETTE && (bstate & GDK_CONTROL_MASK))) || editSubscriber->getEditingType() == ET_OBJECTS) {
needRedraw = editSubscriber->button1Pressed(bstate);
if (editSubscriber->isDragging()) {
state = SEditDrag1;
} else if (editSubscriber->isPicking()) {

4
rtgui/mydiagonalcurve.cc
View File

@@ -1065,10 +1065,6 @@ void MyDiagonalCurve::pipetteMouseOver (CurveEditor *ce, EditDataProvider *provi
// returns true if a point is being dragged
bool MyDiagonalCurve::pipetteButton1Pressed(EditDataProvider *provider, int modifierKey)
{
if (!(modifierKey & GDK_CONTROL_MASK)) {
return false;
}
if (edited_point > 1) {
return false;
}

4
rtgui/myflatcurve.cc
View File

@@ -1278,10 +1278,6 @@ void MyFlatCurve::pipetteMouseOver (CurveEditor *ce, EditDataProvider *provider,
// returns true if a point is being dragged
bool MyFlatCurve::pipetteButton1Pressed(EditDataProvider *provider, int modifierKey)
{
if (!(modifierKey & GDK_CONTROL_MASK)) {
return false;
}
if (edited_point > -1) {
return false;
}