summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_canvas_events.cc
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour/editor_canvas_events.cc')
-rw-r--r--gtk2_ardour/editor_canvas_events.cc10
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();