From 7a0b2e1c18cdc0447581f6a8024377c1b4b1c52a Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 13 Jun 2014 14:27:59 -0400 Subject: fix scrolling behaviour in track headers (event was stolen by rulers because event coordinates made it look as if the event happened there) --- gtk2_ardour/editor_canvas_events.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gtk2_ardour/editor_canvas_events.cc') diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index a9114df5dd..be2b5c3de7 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -160,11 +160,13 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) } bool -Editor::canvas_scroll_event (GdkEventScroll *event) +Editor::canvas_scroll_event (GdkEventScroll *event, bool from_canvas) { - boost::optional rulers = _time_markers_group->bounding_box(); - if (rulers && rulers->contains (Duple (event->x, event->y))) { - return canvas_ruler_event ((GdkEvent*) event, timecode_ruler, TimecodeRulerItem); + if (from_canvas) { + boost::optional rulers = _time_markers_group->bounding_box(); + if (rulers && rulers->contains (Duple (event->x, event->y))) { + return canvas_ruler_event ((GdkEvent*) event, timecode_ruler, TimecodeRulerItem); + } } _track_canvas->grab_focus(); -- cgit v1.2.3