From b4b2a23271bc23b43479a6d2e1d8d0e7f672ec99 Mon Sep 17 00:00:00 2001 From: Nick Mainsbridge Date: Wed, 10 Jun 2009 17:29:10 +0000 Subject: [PATCH] =?UTF-8?q?Fix=20bug=20reported=20by=20Axel=20M=C3=BCller?= =?UTF-8?q?=20on=20the=20list=20where=20marker=20bars,=20canvas=20and=20pl?= =?UTF-8?q?ayhead=20get=20kind=20of=20out=20of=20sync=20with=20the=20timel?= =?UTF-8?q?ine=20(partial=20reversion=20of=20an=20earlier=20commit).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5154 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_canvas.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 7c4207f1d6..b83f39fbc8 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -824,19 +824,18 @@ Editor::tie_vertical_scrolling () void Editor::scroll_canvas_horizontally () { - nframes64_t time_origin = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit); - /* horizontal scrolling only */ - double x_delta; + double x1, y1, x2, y2, x_delta; + _master_group->get_bounds (x1, y1, x2, y2); - x_delta = (leftmost_frame - time_origin) / frames_per_unit; + x_delta = - (x1 + horizontal_adjustment.get_value()); _master_group->move (x_delta, 0); timebar_group->move (x_delta, 0); time_line_group->move (x_delta, 0); cursor_group->move (x_delta, 0); - leftmost_frame = time_origin; + leftmost_frame = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit); update_fixed_rulers (); redisplay_tempo (true);