some rationalization of drag types from various rulers
At present, TempoTwist is Primary-drag on the tempo ruler, and TempoCurve is Primary-drag on the meter ruler. Not sure that this is quite what we want here, but it makes more sense than the prior design, in which TempoTwist was available from non-tempo-related rulers
This commit is contained in:
parent
5738f3d1b1
commit
3327f5b9f1
@ -816,16 +816,16 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
|
|||||||
|
|
||||||
case TempoBarItem:
|
case TempoBarItem:
|
||||||
case TempoCurveItem:
|
case TempoCurveItem:
|
||||||
if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
|
if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)
|
||||||
|
&& !ArdourKeyboard::indicates_constraint (event->button.state)) {
|
||||||
|
_drags->set (new CursorDrag (this, *_playhead_cursor, false), event);
|
||||||
|
} else if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
|
||||||
_drags->set (new TempoCurveDrag (this, item), event);
|
_drags->set (new TempoCurveDrag (this, item), event);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
/* fallthru */
|
return true;
|
||||||
case MarkerBarItem:
|
|
||||||
case MeterBarItem:
|
case MeterBarItem:
|
||||||
case TimecodeRulerItem:
|
|
||||||
case SamplesRulerItem:
|
|
||||||
case MinsecRulerItem:
|
|
||||||
if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)
|
if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)
|
||||||
&& !ArdourKeyboard::indicates_constraint (event->button.state)) {
|
&& !ArdourKeyboard::indicates_constraint (event->button.state)) {
|
||||||
_drags->set (new CursorDrag (this, *_playhead_cursor, false), event);
|
_drags->set (new CursorDrag (this, *_playhead_cursor, false), event);
|
||||||
@ -834,7 +834,6 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
|
|||||||
_drags->set (new TempoTwistDrag (this, item), event);
|
_drags->set (new TempoTwistDrag (this, item), event);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
break;
|
|
||||||
|
|
||||||
case BBTRulerItem:
|
case BBTRulerItem:
|
||||||
if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)
|
if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)
|
||||||
@ -845,6 +844,16 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
|
|||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
case TimecodeRulerItem:
|
||||||
|
case SamplesRulerItem:
|
||||||
|
case MinsecRulerItem:
|
||||||
|
case MarkerBarItem:
|
||||||
|
if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)
|
||||||
|
&& !ArdourKeyboard::indicates_constraint (event->button.state)) {
|
||||||
|
_drags->set (new CursorDrag (this, *_playhead_cursor, false), event);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
|
||||||
case RangeMarkerBarItem:
|
case RangeMarkerBarItem:
|
||||||
if (Keyboard::modifier_state_contains (event->button.state, Keyboard::TertiaryModifier)) {
|
if (Keyboard::modifier_state_contains (event->button.state, Keyboard::TertiaryModifier)) {
|
||||||
_drags->set (new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateSkipMarker), event);
|
_drags->set (new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateSkipMarker), event);
|
||||||
|
Loading…
Reference in New Issue
Block a user