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

Merge branch 'master' into gtk3

Browse Source
This commit is contained in:
Beep6581
2016-03-13 20:04:57 +01:00
parent 3a594bafa3 b0bfe48723
commit cf7a175d74
14 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/diagonalcurveeditorsubgroup.cc
View File

@@ -463,13 +463,15 @@ void DiagonalCurveEditorSubGroup::pipetteMouseOver(EditDataProvider *provider, i
}
}
void DiagonalCurveEditorSubGroup::pipetteButton1Pressed(EditDataProvider *provider, int modifierKey)
bool DiagonalCurveEditorSubGroup::pipetteButton1Pressed(EditDataProvider *provider, int modifierKey)
{
CurveEditor *curveEditor = static_cast<DiagonalCurveEditor*>(parent->displayedCurve);
bool isDragging = false;
switch((DiagonalCurveType)(curveEditor->curveType->getSelected())) {
case (DCT_Spline):
customCurve->pipetteButton1Pressed(provider, modifierKey);
isDragging = customCurve->pipetteButton1Pressed(provider, modifierKey);
break;
case (DCT_Parametric):
@@ -480,13 +482,15 @@ void DiagonalCurveEditorSubGroup::pipetteButton1Pressed(EditDataProvider *provid
break;
case (DCT_NURBS):
NURBSCurve->pipetteButton1Pressed(provider, modifierKey);
isDragging = NURBSCurve->pipetteButton1Pressed(provider, modifierKey);
break;
default: // (DCT_Linear, DCT_Unchanged)
// ... do nothing
break;
}
return isDragging;
}
void DiagonalCurveEditorSubGroup::pipetteButton1Released(EditDataProvider *provider)