diff options
| author | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2016-03-19 13:40:27 +0000 |
|---|---|---|
| committer | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2016-03-19 13:44:18 +0000 |
| commit | 9d5738dc55b80d394f197318141ff6448c8bdd18 (patch) | |
| tree | 6c536e914476704da1ad3004de8dc93c9f5b90fa /gtk2_ardour/editor_canvas.cc | |
| parent | 93449d3431d775d316632eb6c7d15cf4665a8d13 (diff) | |
reset autoscroll speed to minimum when scrolling stops
Reset the autoscroll counter when scrolling stops, and correct the check
when vertical autoscrolling is permitted for whether scrolling has stopped.
Diffstat (limited to 'gtk2_ardour/editor_canvas.cc')
| -rw-r--r-- | gtk2_ardour/editor_canvas.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index a2ad7b3336..1c1d3b3813 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -638,6 +638,7 @@ Editor::autoscroll_canvas () scroll_up_one_track (); vertical_motion = true; } + no_stop = true; } else if (y > autoscroll_boundary.y1) { @@ -645,9 +646,9 @@ Editor::autoscroll_canvas () scroll_down_one_track (); vertical_motion = true; } + no_stop = true; } - no_stop = true; } if (vc.pending || vertical_motion) { @@ -757,7 +758,6 @@ Editor::start_canvas_autoscroll (bool allow_horiz, bool allow_vert, const Ardour stop_canvas_autoscroll (); - autoscroll_cnt = 0; autoscroll_horizontal_allowed = allow_horiz; autoscroll_vertical_allowed = allow_vert; autoscroll_boundary = boundary; @@ -776,6 +776,7 @@ void Editor::stop_canvas_autoscroll () { autoscroll_connection.disconnect (); + autoscroll_cnt = 0; } Editor::EnterContext* |