merge with dev
This commit is contained in:
@@ -1388,7 +1388,7 @@ CursorShape ControlSpotPanel::getCursor(int objectID)
|
||||
}
|
||||
}
|
||||
|
||||
bool ControlSpotPanel::mouseOver(int modifierKey)
|
||||
const bool ControlSpotPanel::mouseOver(int modifierKey)
|
||||
{
|
||||
EditDataProvider* editProvider_ = getEditProvider();
|
||||
const auto s = treeview_.get_selection();
|
||||
@@ -1544,15 +1544,14 @@ bool ControlSpotPanel::button1Pressed(int modifierKey)
|
||||
}
|
||||
|
||||
lastCoord_->set(provider->posImage.x + provider->deltaImage.x, provider->posImage.y + provider->deltaImage.y);
|
||||
EditSubscriber::action = ES_ACTION_DRAGGING;
|
||||
EditSubscriber::action = EditSubscriber::Action::DRAGGING;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ControlSpotPanel::button1Released()
|
||||
{
|
||||
// printf("button1Released\n");
|
||||
|
||||
EditSubscriber::action = ES_ACTION_NONE;
|
||||
EditSubscriber::action = EditSubscriber::Action::NONE;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user