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

Merge pull request #4750 from OmrSi/even-more-highlighting

Browse Source 
Work on richtextbox selection length and highlighting
This commit is contained in:
Nikolaj Olsson 2021-01-23 17:29:41 +01:00 committed by GitHub
commit 1bc9126381
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/ui/Controls/AdvancedTextBox.cs
View File

@ -34,7 +34,7 @@ namespace Nikse.SubtitleEdit.Controls
private string _currentDictionary;
private string _uiTextBoxOldText;
private static readonly char[] SplitChars = { ' ', '.', ',', '?', '!', ':', ';', '"', '“', '”', '(', ')', '[', ']', '{', '}', '|', '<', '>', '/', '+', '\r', '\n', '\b', '¿', '¡', '…', '—', '–', '♪', '♫', '„', '«', '»', '‹', '›', '؛', '،', '؟' };
private static readonly char[] SplitChars = { ' ', '.', ',', '?', '!', ':', ';', '"', '“', '”', '(', ')', '[', ']', '{', '}', '|', '<', '>', '/', '+', '¿', '¡', '…', '—', '–', '♪', '♫', '„', '«', '»', '‹', '›', '؛', '،', '؟' };
public int CurrentLineIndex { get; set; }
public string CurrentLanguage { get; set; }
@ -65,9 +65,12 @@ namespace Nikse.SubtitleEdit.Controls
SetTextPosInRtbIfCentered();
TextChanged += TextChangedHighlight;
KeyPress += UiTextBox_KeyPress;
KeyDown += UiTextBox_KeyDown;
MouseDown += UiTextBox_MouseDown;
if (_isLiveSpellCheckEnabled)
{
KeyPress += UiTextBox_KeyPress;
KeyDown += UiTextBox_KeyDown;
MouseDown += UiTextBox_MouseDown;
}
HandleCreated += (sender, args) =>
{
@ -79,7 +82,7 @@ namespace Nikse.SubtitleEdit.Controls
var charIndex = GetCharIndexFromPosition(args.Location);
if (Configuration.Settings.General.CenterSubtitleInTextBox &&
_mouseMoveSelectionLength == 0 &&
(charIndex == 0 || charIndex >= 0 && Text[charIndex - 1] == '\n'))
(charIndex == 0 || charIndex >= 0 && base.Text[charIndex - 1] == '\n'))
{
SelectionLength = 0;
}
@ -216,7 +219,7 @@ namespace Nikse.SubtitleEdit.Controls
return 0;
}
var text = Text;
var text = base.Text;
var extra = 0;
var start = SelectionStart;
for (int i = start; i < target + start && i < text.Length; i++)
@ -238,7 +241,18 @@ namespace Nikse.SubtitleEdit.Controls
return;
}
base.SelectionLength = GetIndexWithLineBreak(value);
var text = base.Text;
var extra = 0;
var start = SelectionStart;
for (int i = start; i < target + start && i < text.Length; i++)
{
if (text[i] == '\n')
{
extra++;
}
}
base.SelectionLength = target - extra;
}
}
@ -256,7 +270,7 @@ namespace Nikse.SubtitleEdit.Controls
private int GetIndexWithLineBreak(int index)
{
var text = Text;
var text = base.Text;
var extra = 0;
for (int i = 0; i < index && i < text.Length; i++)
{
@ -297,6 +311,7 @@ namespace Nikse.SubtitleEdit.Controls
private void TagsChangedCheck()
{
// Request spell check if there is a change in tags to update highlighting indices.
if (!string.IsNullOrEmpty(_uiTextBoxOldText)
&& HtmlUtil.RemoveHtmlTags(_uiTextBoxOldText, true) == HtmlUtil.RemoveHtmlTags(Text, true))
{
@ -311,13 +326,16 @@ namespace Nikse.SubtitleEdit.Controls
{
_checkRtfChange = false;
// Request spell check if there is a change in tags to update highlighting indices.
if (_isLiveSpellCheckEnabled)
{
TagsChangedCheck();
DoFormattingActionOnRtb(() =>
{
HighlightHtmlText();
HighlightSpellCheckWords();
});
}
if (ContainsTags() || IsSpellCheckRequested)
else if (ContainsTags())
{
DoFormattingActionOnRtb(HighlightHtmlText);
}
@ -439,21 +457,6 @@ namespace Nikse.SubtitleEdit.Controls
i++;
}
if (IsSpellCheckRequested)
{
DoLiveSpellCheck();
if (_wrongWords?.Count > 0)
{
foreach (var wrongWord in _wrongWords)
{
Select(GetIndexWithLineBreak(wrongWord.Index), wrongWord.Length);
SelectionColor = Configuration.Settings.Tools.ListViewSyntaxErrorColor;
}
}
IsSpellCheckRequested = false;
}
}
private void SetHtmlColor(string text, int htmlTagStart)
@ -875,12 +878,15 @@ namespace Nikse.SubtitleEdit.Controls
private void UiTextBox_KeyPress(object sender, KeyPressEventArgs e)
{
if (_isLiveSpellCheckEnabled && (SplitChars.Contains(e.KeyChar)
&& SelectionStart == Text.Length || SelectionStart != Text.Length))
if (_isLiveSpellCheckEnabled)
{
IsSpellCheckRequested = true;
if (e.KeyChar == '\b' || e.KeyChar == '\r' || e.KeyChar == '\n')
if (SplitChars.Contains(e.KeyChar) && SelectionStart == Text.Length || SelectionStart != Text.Length)
{
IsSpellCheckRequested = true;
}
else if (e.KeyChar == '\b' && SelectionStart != Text.Length || e.KeyChar == '\r' || e.KeyChar == '\n')
{
IsSpellCheckRequested = true;
TextChangedHighlight(this, EventArgs.Empty);
}
}
@ -989,6 +995,24 @@ namespace Nikse.SubtitleEdit.Controls
}
}
private void HighlightSpellCheckWords()
{
if (_isLiveSpellCheckEnabled)
{
DoLiveSpellCheck();
if (_wrongWords?.Count > 0)
{
foreach (var wrongWord in _wrongWords)
{
Select(GetIndexWithLineBreak(wrongWord.Index), wrongWord.Length);
SelectionColor = Configuration.Settings.Tools.ListViewSyntaxErrorColor;
}
}
IsSpellCheckRequested = false;
}
}
#endregion
}
}

2
src/ui/Forms/Options/Settings.Designer.cs generated
View File

@ -4385,7 +4385,7 @@ namespace Nikse.SubtitleEdit.Forms.Options
//
this.comboBoxSubtitleFont.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxSubtitleFont.FormattingEnabled = true;
this.comboBoxSubtitleFont.Location = new System.Drawing.Point(331, 20);
this.comboBoxSubtitleFont.Location = new System.Drawing.Point(210, 20);
this.comboBoxSubtitleFont.Name = "comboBoxSubtitleFont";
this.comboBoxSubtitleFont.Size = new System.Drawing.Size(188, 21);
this.comboBoxSubtitleFont.TabIndex = 29;