From 090fdecb95814d93239a40e64a6915e9676047fc Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 27 Dec 2011 01:38:08 +0000 Subject: [PATCH] Scroll instantly to the audio playback position when "Lock Scroll on Cursor" is enabled Originally committed to SVN as r6169. --- aegisub/src/audio_display.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aegisub/src/audio_display.cpp b/aegisub/src/audio_display.cpp index fc024b6b0..a18e699fb 100644 --- a/aegisub/src/audio_display.cpp +++ b/aegisub/src/audio_display.cpp @@ -1274,11 +1274,11 @@ void AudioDisplay::OnPlaybackPosition(int64_t sample_position) int edge_size = client_width / 20; if (scroll_left > 0 && pixel_position < scroll_left + edge_size) { - ScrollBy(-std::min(edge_size, scroll_left)); + ScrollPixelToLeft(std::max(pixel_position - edge_size, 0)); } else if (scroll_left + client_width < std::min(pixel_audio_width - 1, pixel_position + edge_size)) { - ScrollBy(std::min(edge_size, pixel_audio_width - client_width - scroll_left - 1)); + ScrollPixelToLeft(std::min(pixel_position - client_width + edge_size, pixel_audio_width - client_width - 1)); } } }