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

merge with dev

Browse Source
This commit is contained in:
Desmis
2019-03-26 08:23:01 +01:00
parent 041c8c0e79 90e1480b7f
commit e1705ab94b
7 changed files with 91 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rtgui/curveeditor.cc
View File

@@ -31,12 +31,12 @@ class CurveTypePopUpButton: public PopUpToggleButton {
public:
CurveTypePopUpButton(const Glib::ustring &label=""):
PopUpToggleButton(label) {}
void setPosIndexMap(const std::vector<int> &pmap)
{
posidxmap_ = pmap;
}
protected:
int posToIndex(int pos) const override
{
@@ -81,7 +81,7 @@ DiagonalCurveEditor::DiagonalCurveEditor (Glib::ustring text, CurveEditorGroup*
curveType->addEntry("curve-nurbs-small.png", M("CURVEEDITOR_NURBS")); // 3 NURBS
static_cast<CurveTypePopUpButton *>(curveType)->setPosIndexMap({ 0, 1, 4, 2, 3 });
curveType->setSelected(DCT_Linear);
curveType->show();
rangeLabels[0] = M("CURVEEDITOR_SHADOWS");
@@ -148,7 +148,7 @@ void DiagonalCurveEditor::setResetCurve(DiagonalCurveType cType, const std::vect
}
break;
default:
break;
}
@@ -462,7 +462,7 @@ void CurveEditor::switchOffEditMode ()
EditSubscriber::switchOffEditMode(); // disconnect
}
const bool CurveEditor::mouseOver(const int modifierKey)
bool CurveEditor::mouseOver(int modifierKey)
{
EditDataProvider* provider = getEditProvider();
subGroup->pipetteMouseOver(provider, modifierKey);
@@ -470,7 +470,7 @@ const bool CurveEditor::mouseOver(const int modifierKey)
return true; // return true will ask the preview to be redrawn, for the cursor
}
bool CurveEditor::button1Pressed(const int modifierKey)
bool CurveEditor::button1Pressed(int modifierKey)
{
EditDataProvider* provider = getEditProvider();
@@ -495,7 +495,7 @@ bool CurveEditor::button1Released()
return true;
}
bool CurveEditor::drag1(const int modifierKey)
bool CurveEditor::drag1(int modifierKey)
{
EditDataProvider* provider = getEditProvider();
subGroup->pipetteDrag(provider, modifierKey);
@@ -503,7 +503,7 @@ bool CurveEditor::drag1(const int modifierKey)
return false;
}
const CursorShape CurveEditor::getCursor(const int objectID) const
CursorShape CurveEditor::getCursor(int objectID) const
{
if (remoteDrag) {
return CSResizeHeight;