ardour/livetrax
13
0
Fork 0
Code

Mini-timeline: Any click not on a marker should trigger a locate

Browse Source
This commit is contained in:
Ben Loftis 2016-12-17 19:18:16 -06:00
parent 28b5e8b6e2
commit 291631759c
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk2_ardour/mini_timeline.cc
View File

@ -454,18 +454,21 @@ bool
MiniTimeline::on_button_release_event (GdkEventButton *ev) MiniTimeline::on_button_release_event (GdkEventButton *ev)
{ {
if (!_session) { return true; } if (!_session) { return true; }
if (ev->y < get_height () * .5) {
for (JumpList::const_iterator i = _jumplist.begin (); i != _jumplist.end(); ++i) { bool handled = false;
if (i->left < ev->x && ev->x < i->right) { for (JumpList::const_iterator i = _jumplist.begin (); i != _jumplist.end(); ++i) {
if (ev->button == 3) { if (i->left < ev->x && ev->x < i->right) {
PublicEditor::instance().center_screen (i->to); if (ev->button == 3) {
} else if (ev->button == 1) { PublicEditor::instance().center_screen (i->to);
_session->request_locate (i->to, _session->transport_rolling ()); } else if (ev->button == 1) {
} _session->request_locate (i->to, _session->transport_rolling ());
break;
} }
handled = true;
break;
} }
} else if (ev->button == 1) { }
if ( !handled && ev->button == 1 ) {
// copy from ::render() // TODO consolidate // copy from ::render() // TODO consolidate
const framepos_t time_span = _session->config.get_minitimeline_span () / 2; const framepos_t time_span = _session->config.get_minitimeline_span () / 2;
const framepos_t time_span_samples = time_span * _session->nominal_frame_rate (); const framepos_t time_span_samples = time_span * _session->nominal_frame_rate ();
@ -475,6 +478,7 @@ MiniTimeline::on_button_release_event (GdkEventButton *ev)
framepos_t when = p + (ev->x - get_width() * .5) / px_per_sample; framepos_t when = p + (ev->x - get_width() * .5) / px_per_sample;
_session->request_locate (std::max ((framepos_t)0, when), _session->transport_rolling ()); _session->request_locate (std::max ((framepos_t)0, when), _session->transport_rolling ());
} }
return true; return true;
} }