Don't allow non-movable meter / tempo markers to be
dragged (part of #4313). git-svn-id: svn://localhost/ardour2/branches/3.0@10067 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
6972b09116
commit
632c4ab264
@ -589,26 +589,42 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
|
|||||||
return true;
|
return true;
|
||||||
|
|
||||||
case TempoMarkerItem:
|
case TempoMarkerItem:
|
||||||
_drags->set (
|
{
|
||||||
new TempoMarkerDrag (
|
TempoMarker* m = reinterpret_cast<TempoMarker*> (item->get_data ("marker"));
|
||||||
this,
|
assert (m);
|
||||||
item,
|
if (m->tempo().movable ()) {
|
||||||
Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)
|
_drags->set (
|
||||||
),
|
new TempoMarkerDrag (
|
||||||
event
|
this,
|
||||||
);
|
item,
|
||||||
return true;
|
Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)
|
||||||
|
),
|
||||||
|
event
|
||||||
|
);
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
case MeterMarkerItem:
|
case MeterMarkerItem:
|
||||||
_drags->set (
|
{
|
||||||
new MeterMarkerDrag (
|
MeterMarker* m = reinterpret_cast<MeterMarker*> (item->get_data ("marker"));
|
||||||
this,
|
assert (m);
|
||||||
item,
|
if (m->meter().movable ()) {
|
||||||
Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)
|
_drags->set (
|
||||||
),
|
new MeterMarkerDrag (
|
||||||
event
|
this,
|
||||||
);
|
item,
|
||||||
return true;
|
Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)
|
||||||
|
),
|
||||||
|
event
|
||||||
|
);
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
case MarkerBarItem:
|
case MarkerBarItem:
|
||||||
case TempoBarItem:
|
case TempoBarItem:
|
||||||
|
Loading…
Reference in New Issue
Block a user