iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Center the audio display when a line is within 5% of an edge as 2.1 did

This commit is contained in:
Thomas Goyne 2012-10-06 07:23:49 -07:00
parent 8d89e8c268
commit 846449cb03
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
aegisub/src/audio_display.cpp
View File

@ -631,15 +631,15 @@ void AudioDisplay::ScrollTimeRangeInView(const TimeRange &range)
int range_end = AbsoluteXFromTime(range.end()); int range_end = AbsoluteXFromTime(range.end());
int range_len = range_end - range_begin; int range_len = range_end - range_begin;
// Is everything already in view? // Remove 5 % from each side of the client area.
if (range_begin >= scroll_left && range_end <= scroll_left+client_width)
return;
// For the rest of the calculation, remove 5 % from each side of the client area.
// The leftadjust is the amount to subtract from the final scroll_left value.
int leftadjust = client_width / 20; int leftadjust = client_width / 20;
int client_left = scroll_left + leftadjust;
client_width = client_width * 9 / 10; client_width = client_width * 9 / 10;
// Is everything already in view?
if (range_begin >= client_left && range_end <= client_left+client_width)
return;
// The entire range can fit inside the view, center it // The entire range can fit inside the view, center it
if (range_len < client_width) if (range_len < client_width)
{ {
@ -647,13 +647,13 @@ void AudioDisplay::ScrollTimeRangeInView(const TimeRange &range)
} }
// Range doesn't fit in view and we're viewing a middle part of it, just leave it alone // Range doesn't fit in view and we're viewing a middle part of it, just leave it alone
else if (range_begin < scroll_left+leftadjust && range_end > scroll_left+leftadjust+client_width) else if (range_begin < client_left && range_end > client_left+client_width)
{ {
// nothing // nothing
} }
// Right edge is in view, scroll it as far to the right as possible // Right edge is in view, scroll it as far to the right as possible
else if (range_end >= scroll_left+leftadjust && range_end < scroll_left+leftadjust+client_width) else if (range_end >= client_left && range_end < client_left+client_width)
{ {
ScrollPixelToLeft(range_end - client_width - leftadjust); ScrollPixelToLeft(range_end - client_width - leftadjust);
} }