merge with dev

This commit is contained in:
Desmis
2019-03-26 08:23:01 +01:00
7 changed files with 91 additions and 73 deletions

View File

@@ -333,7 +333,7 @@ void Gradient::editToggled ()
}
}
const CursorShape Gradient::getCursor(const int objectID) const
CursorShape Gradient::getCursor(int objectID) const
{
switch (objectID) {
case (0):
@@ -359,7 +359,7 @@ const CursorShape Gradient::getCursor(const int objectID) const
}
}
const bool Gradient::mouseOver(const int modifierKey)
bool Gradient::mouseOver(int modifierKey)
{
EditDataProvider* editProvider = getEditProvider();
@@ -389,7 +389,7 @@ const bool Gradient::mouseOver(const int modifierKey)
return false;
}
bool Gradient::button1Pressed(const int modifierKey)
bool Gradient::button1Pressed(int modifierKey)
{
if (lastObject < 0) {
return false;
@@ -468,7 +468,7 @@ bool Gradient::button1Released()
return true;
}
bool Gradient::drag1(const int modifierKey)
bool Gradient::drag1(int modifierKey)
{
// compute the polar coordinate of the mouse position
EditDataProvider *provider = getEditProvider();