Merge branch 'master' into gtk3

2016-03-13 20:04:57 +01:00
parent 3a594bafa3 b0bfe48723
commit cf7a175d74
14 changed files with 42 additions and 23 deletions
--- a/rtgui/myflatcurve.cc
+++ b/rtgui/myflatcurve.cc
@@ -1273,10 +1273,11 @@ void MyFlatCurve::pipetteMouseOver (CurveEditor *ce, EditDataProvider *provider,
    }
 }

-void MyFlatCurve::pipetteButton1Pressed(EditDataProvider *provider, int modifierKey)
+// returns true if a point is being dragged
+bool MyFlatCurve::pipetteButton1Pressed(EditDataProvider *provider, int modifierKey)
 {
    if (edited_point > -1) {
-        return;
+        return false;
    }

    buttonPressed = true;
@@ -1353,6 +1354,7 @@ void MyFlatCurve::pipetteButton1Pressed(EditDataProvider *provider, int modifier
        break;
    }

+    return true;
 }

 void MyFlatCurve::pipetteButton1Released(EditDataProvider *provider)