From abd11da072ea124445d50583c5445356d10f7457 Mon Sep 17 00:00:00 2001 From: Hombre Date: Tue, 9 May 2017 20:02:08 +0200 Subject: [PATCH] New candidate fix for #3862, modifier keys handled in cropwindow.cc --- rtgui/cropwindow.cc | 2 +- rtgui/mydiagonalcurve.cc | 4 ---- rtgui/myflatcurve.cc | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/rtgui/cropwindow.cc b/rtgui/cropwindow.cc index 5c5a318c4..25311b97b 100644 --- a/rtgui/cropwindow.cc +++ b/rtgui/cropwindow.cc @@ -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()) { diff --git a/rtgui/mydiagonalcurve.cc b/rtgui/mydiagonalcurve.cc index 2e908bf83..bf146b03d 100644 --- a/rtgui/mydiagonalcurve.cc +++ b/rtgui/mydiagonalcurve.cc @@ -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; } diff --git a/rtgui/myflatcurve.cc b/rtgui/myflatcurve.cc index e71f09567..210fb42f2 100644 --- a/rtgui/myflatcurve.cc +++ b/rtgui/myflatcurve.cc @@ -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; }