diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-13 14:27:59 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-13 14:27:59 -0400 |
| commit | 7a0b2e1c18cdc0447581f6a8024377c1b4b1c52a (patch) | |
| tree | f56570432d6e8f3b7bba7dcf3a9ec9040171d307 /gtk2_ardour/editor_canvas_events.cc | |
| parent | 7d678604fad1ac009c48fd6c91a1041a588b8b50 (diff) | |
fix scrolling behaviour in track headers (event was stolen by rulers because event coordinates made it look as if the event happened there)
Diffstat (limited to 'gtk2_ardour/editor_canvas_events.cc')
| -rw-r--r-- | gtk2_ardour/editor_canvas_events.cc | 10 |
1 files changed, 6 insertions, 4 deletions
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<Rect> 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<Rect> 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(); |