Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 06:52:35 +01:00
Code Issues Projects Releases Wiki Activity

Improve set alignment in textbox - thx OmrSi :)

Browse Source 
Work on #3403
This commit is contained in:
Nikolaj Olsson 2019-02-25 16:49:23 +01:00
parent 42f13380b1
commit 7b5a5c6cec
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Forms/Main.cs
View File

@ -16003,11 +16003,11 @@ namespace Nikse.SubtitleEdit.Forms
var original = Utilities.GetOriginalParagraph(i, _subtitle.Paragraphs[i], _subtitleAlternate.Paragraphs); var original = Utilities.GetOriginalParagraph(i, _subtitle.Paragraphs[i], _subtitleAlternate.Paragraphs);
if (original != null) if (original != null)
{ {
SetAlignTag(original, tag); original.Text = SetAlignTag(original.Text, tag);
SubtitleListview1.SetAlternateText(i, original.Text); SubtitleListview1.SetAlternateText(i, original.Text);
} }
} }
SetAlignTag(_subtitle.Paragraphs[i], tag); _subtitle.Paragraphs[i].Text = SetAlignTag(_subtitle.Paragraphs[i].Text, tag);
SubtitleListview1.SetText(i, _subtitle.Paragraphs[i].Text); SubtitleListview1.SetText(i, _subtitle.Paragraphs[i].Text);
} }
SubtitleListview1.EndUpdate(); SubtitleListview1.EndUpdate();
@ -16023,20 +16023,7 @@ namespace Nikse.SubtitleEdit.Forms
var pos = tb.SelectionStart; var pos = tb.SelectionStart;
int oldLength = tb.Text.Length; int oldLength = tb.Text.Length;
bool atEnd = pos == oldLength; bool atEnd = pos == oldLength;
if (tb.Text.StartsWith(tag, StringComparison.Ordinal) && tb.Text.Length > 5 && tb.Text[5] == '}') tb.Text = SetAlignTag(tb.Text, tag);
{
tb.Text = tb.Text.Remove(0, 6);
tag = string.Empty;
}
else if (tb.Text.StartsWith("{\\a", StringComparison.Ordinal) && tb.Text.Length > 5 && tb.Text[5] == '}')
{
tb.Text = tb.Text.Remove(0, 6);
}
else if (tb.Text.StartsWith("{\\a", StringComparison.Ordinal) && tb.Text.Length > 4 && tb.Text[4] == '}')
{
tb.Text = tb.Text.Remove(0, 5);
}
tb.Text = string.Format(@"{0}{1}", tag, tb.Text);
if (atEnd) if (atEnd)
{ {
tb.SelectionStart = tb.Text.Length; tb.SelectionStart = tb.Text.Length;
@ -24070,16 +24057,20 @@ namespace Nikse.SubtitleEdit.Forms
.Replace("{\\a9}", string.Empty); .Replace("{\\a9}", string.Empty);
} }
private static void SetAlignTag(Paragraph p, string tag) private static string SetAlignTag(string s, string tag)
{ {
var text = RemoveAssAlignmentTags(p.Text); var text = RemoveAssAlignmentTags(s);
if (text.StartsWith("{\\", StringComparison.Ordinal) && text.Contains('}')) if (text.StartsWith("{\\", StringComparison.Ordinal) && text.Contains('}'))
{ {
p.Text = text.Insert(1, "\\" + tag.TrimStart('{').TrimStart('\\').TrimEnd('}')); if (!string.IsNullOrEmpty(tag))
{
return text.Insert(1, "\\" + tag.TrimStart('{').TrimStart('\\').TrimEnd('}'));
}
return text;
} }
else else
{ {
p.Text = string.Format(@"{0}{1}", tag, text); return string.Format(@"{0}{1}", tag, text);
} }
} }