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-25 11:19:06 +01:00
parent 11593e745c 6747c5c7df
commit 404604f491
68 changed files with 3707 additions and 826 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtgui/curveeditor.cc
View File

@@ -462,7 +462,7 @@ void CurveEditor::switchOffEditMode ()
EditSubscriber::switchOffEditMode(); // disconnect
}
bool CurveEditor::mouseOver(const int modifierKey)
const bool CurveEditor::mouseOver(const int modifierKey)
{
EditDataProvider* provider = getEditProvider();
subGroup->pipetteMouseOver(provider, modifierKey);
@@ -474,12 +474,12 @@ bool CurveEditor::button1Pressed(const int modifierKey)
{
EditDataProvider* provider = getEditProvider();
if (provider->object) {
if (provider->getObject()) {
remoteDrag = subGroup->pipetteButton1Pressed(provider, modifierKey);
}
if (remoteDrag) {
action = ES_ACTION_DRAGGING;
action = EditSubscriber::Action::DRAGGING;
}
subGroup->refresh(this);
@@ -503,7 +503,7 @@ bool CurveEditor::drag1(const int modifierKey)
return false;
}
CursorShape CurveEditor::getCursor(const int objectID)
const CursorShape CurveEditor::getCursor(const int objectID) const
{
if (remoteDrag) {
return CSResizeHeight;