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

18
rtgui/gradient.cc
View File

@@ -333,7 +333,7 @@ void Gradient::editToggled ()
}
}
CursorShape Gradient::getCursor(const int objectID)
const CursorShape Gradient::getCursor(const int objectID) const
{
switch (objectID) {
case (0):
@@ -359,11 +359,11 @@ CursorShape Gradient::getCursor(const int objectID)
}
}
bool Gradient::mouseOver(const int modifierKey)
const bool Gradient::mouseOver(const int modifierKey)
{
EditDataProvider* editProvider = getEditProvider();
if (editProvider && editProvider->object != lastObject) {
if (editProvider && editProvider->getObject() != lastObject) {
if (lastObject > -1) {
if (lastObject == 2 || lastObject == 3) {
EditSubscriber::visibleGeometry.at(2)->state = Geometry::NORMAL;
@@ -373,16 +373,16 @@ bool Gradient::mouseOver(const int modifierKey)
}
}
if (editProvider->object > -1) {
if (editProvider->object == 2 || editProvider->object == 3) {
if (editProvider->getObject() > -1) {
if (editProvider->getObject() == 2 || editProvider->getObject() == 3) {
EditSubscriber::visibleGeometry.at(2)->state = Geometry::PRELIGHT;
EditSubscriber::visibleGeometry.at(3)->state = Geometry::PRELIGHT;
} else {
EditSubscriber::visibleGeometry.at(editProvider->object)->state = Geometry::PRELIGHT;
EditSubscriber::visibleGeometry.at(editProvider->getObject())->state = Geometry::PRELIGHT;
}
}
lastObject = editProvider->object;
lastObject = editProvider->getObject();
return true;
}
@@ -443,7 +443,7 @@ bool Gradient::button1Pressed(const int modifierKey)
draggedFeatherOffset -= (feather->getValue() / 200. * diagonal);
}
EditSubscriber::action = ES_ACTION_DRAGGING;
EditSubscriber::action = EditSubscriber::Action::DRAGGING;
return false;
} else { // should theoretically always be true
// this will let this class ignore further drag events
@@ -464,7 +464,7 @@ bool Gradient::button1Pressed(const int modifierKey)
bool Gradient::button1Released()
{
draggedPointOldAngle = -1000.;
EditSubscriber::action = ES_ACTION_NONE;
EditSubscriber::action = EditSubscriber::Action::NONE;
return true;
}