Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-23 19:52:48 +01:00
Code Issues Projects Releases Wiki Activity

Respect line break for waveform preview text - thx Leon :)

Browse Source 
Fix #2992
This commit is contained in:
Nikolaj Olsson 2018-08-03 18:25:33 +02:00
parent 558b48604e
commit c7c7293652
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/Controls/AudioVisualizer.cs
View File

@ -746,23 +746,8 @@ namespace Nikse.SubtitleEdit.Controls
// paragraph text // paragraph text
if (n > 80) if (n > 80)
{ {
string text = HtmlUtil.RemoveHtmlTags(paragraph.Text, true).Replace(Environment.NewLine, " "); string text = HtmlUtil.RemoveHtmlTags(paragraph.Text, true); //.Replace(Environment.NewLine, " ");
if (Configuration.Settings.General.RightToLeftMode && LanguageAutoDetect.CouldBeRightToLeftLanguge(new Subtitle(_displayableParagraphs))) DrawParagraphText(graphics, text, font, currentRegionWidth, padding, drawStringOutlined, currentRegionLeft);
text = Utilities.ReverseStartAndEndingForRightToLeft(text);
int removeLength = 1;
if (text.Length > 500)
text = text.Substring(0, 500); // don't now allow very long texts as they can make SE unresponsive - see https://github.com/SubtitleEdit/subtitleedit/issues/2536
while (text.Length > removeLength && graphics.MeasureString(text, font).Width > currentRegionWidth - padding - 1)
{
text = text.Remove(text.Length - removeLength).TrimEnd() + "…";
if (text.Length > 200)
removeLength = 21;
else if (text.Length > 100)
removeLength = 11;
else
removeLength = 2;
}
drawStringOutlined(text, currentRegionLeft + padding, padding);
} }
// paragraph number // paragraph number
@ -785,6 +770,36 @@ namespace Nikse.SubtitleEdit.Controls
} }
} }
private void DrawParagraphText(Graphics graphics, string text, Font font, int currentRegionWidth, int padding, Action<string, int, int> drawStringOutlined, int currentRegionLeft)
{
if (Configuration.Settings.General.RightToLeftMode && LanguageAutoDetect.CouldBeRightToLeftLanguge(new Subtitle(_displayableParagraphs)))
text = Utilities.ReverseStartAndEndingForRightToLeft(text);
if (text.Length > 500)
text = text.Substring(0, 500); // don't now allow very long texts as they can make SE unresponsive - see https://github.com/SubtitleEdit/subtitleedit/issues/2536
int y = padding;
var max = currentRegionWidth - padding - 1;
foreach (var line in text.SplitToLines())
{
text = line;
int removeLength = 1;
var measureResult = graphics.MeasureString(text, font);
while (text.Length > removeLength && graphics.MeasureString(text, font).Width > max)
{
text = text.Remove(text.Length - removeLength).TrimEnd() + "…";
if (text.Length > 200)
removeLength = 21;
else if (text.Length > 100)
removeLength = 11;
else
removeLength = 2;
measureResult = graphics.MeasureString(text, font);
}
drawStringOutlined(text, currentRegionLeft + padding, y);
y += (int)Math.Round(measureResult.Height, MidpointRounding.AwayFromZero);
}
}
private double RelativeXPositionToSeconds(int x) private double RelativeXPositionToSeconds(int x)
{ {
return _startPositionSeconds + (double)x / _wavePeaks.SampleRate / _zoomFactor; return _startPositionSeconds + (double)x / _wavePeaks.SampleRate / _zoomFactor;