Merge branch 'master' into gtk3

This commit is contained in:
Beep6581
2016-03-13 20:04:57 +01:00
14 changed files with 42 additions and 23 deletions

View File

@@ -210,13 +210,15 @@ void FlatCurveEditorSubGroup::pipetteMouseOver(EditDataProvider *provider, int m
}
}
void FlatCurveEditorSubGroup::pipetteButton1Pressed(EditDataProvider *provider, int modifierKey)
bool FlatCurveEditorSubGroup::pipetteButton1Pressed(EditDataProvider *provider, int modifierKey)
{
CurveEditor *curveEditor = static_cast<FlatCurveEditor*>(parent->displayedCurve);
bool isDragging = false;
switch((FlatCurveType)(curveEditor->curveType->getSelected())) {
case (FCT_MinMaxCPoints):
CPointsCurve->pipetteButton1Pressed(provider, modifierKey);
isDragging = CPointsCurve->pipetteButton1Pressed(provider, modifierKey);
CPointsCurve->setDirty(true);
break;
@@ -224,6 +226,8 @@ void FlatCurveEditorSubGroup::pipetteButton1Pressed(EditDataProvider *provider,
// ... do nothing
break;
}
return isDragging;
}
void FlatCurveEditorSubGroup::pipetteButton1Released(EditDataProvider *provider)