merge with dev

This commit is contained in:
Desmis
2019-03-26 08:33:23 +01:00
parent e1705ab94b
commit 2289fa8e94
2 changed files with 2 additions and 2 deletions

View File

@@ -1388,7 +1388,7 @@ CursorShape ControlSpotPanel::getCursor(int objectID)
} }
} }
const bool ControlSpotPanel::mouseOver(int modifierKey) bool ControlSpotPanel::mouseOver(int modifierKey)
{ {
EditDataProvider* editProvider_ = getEditProvider(); EditDataProvider* editProvider_ = getEditProvider();
const auto s = treeview_.get_selection(); const auto s = treeview_.get_selection();

View File

@@ -249,7 +249,7 @@ private:
void updateControlSpotCurve(Gtk::TreeModel::Row row); void updateControlSpotCurve(Gtk::TreeModel::Row row);
void deleteControlSpotCurve(Gtk::TreeModel::Row row); void deleteControlSpotCurve(Gtk::TreeModel::Row row);
CursorShape getCursor(int objectID); CursorShape getCursor(int objectID);
const bool mouseOver(int modifierKey); bool mouseOver(int modifierKey);
bool button1Pressed(int modifierKey); bool button1Pressed(int modifierKey);
bool button1Released(); bool button1Released();
bool drag1(int modifierKey); bool drag1(int modifierKey);