Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/text changed event args changed range #215

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix/text changed event args changed range #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
150851f
adds SetStartAndEnd and uses it where Start.set is only called for th…
Oct 9, 2020
3b87960
Makes current behavior more explicitly visible
Oct 9, 2020
95efc53
Changes behavior of setter, fixes issue
Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions FastColoredTextBox/AutocompleteItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,11 @@ public override void OnSelected(AutocompleteMenu popupMenu, SelectedEventArgs e)
{
for (int iLine = p1.iLine + 1; iLine <= p2.iLine; iLine++)
{
e.Tb.Selection.Start = new Place(0, iLine);
e.Tb.Selection.SetStartAndEnd(new Place(0, iLine));
e.Tb.DoAutoIndent(iLine);
}
}
e.Tb.Selection.Start = p1;
e.Tb.Selection.SetStartAndEnd(p1);
//move caret position right and find char ^
while (e.Tb.Selection.CharBeforeStart != '^')
if (!e.Tb.Selection.GoRightThroughFolded())
Expand Down
2 changes: 1 addition & 1 deletion FastColoredTextBox/Bookmarks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ public class Bookmark
/// </summary>
public virtual void DoVisible()
{
TB.Selection.Start = new Place(0, LineIndex);
TB.Selection.SetStartAndEnd(new Place(0, LineIndex));
TB.DoRangeVisible(TB.Selection, true);
TB.Invalidate();
}
Expand Down
38 changes: 19 additions & 19 deletions FastColoredTextBox/Commands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public override void Undo()
case '\n': MergeLines(sel.Start.iLine, ts); break;
case '\r': break;
case '\b':
ts.CurrentTB.Selection.Start = lastSel.Start;
ts.CurrentTB.Selection.SetStartAndEnd(lastSel.Start);
char cc = '\x0';
if (deletedChar != '\x0')
{
Expand All @@ -45,12 +45,12 @@ public override void Undo()
ts.CurrentTB.ExpandBlock(sel.Start.iLine);
for (int i = sel.FromX; i < lastSel.FromX; i++)
ts[sel.Start.iLine].RemoveAt(sel.Start.iChar);
ts.CurrentTB.Selection.Start = sel.Start;
ts.CurrentTB.Selection.SetStartAndEnd(sel.Start);
break;
default:
ts.CurrentTB.ExpandBlock(sel.Start.iLine);
ts[sel.Start.iLine].RemoveAt(sel.Start.iChar);
ts.CurrentTB.Selection.Start = sel.Start;
ts.CurrentTB.Selection.SetStartAndEnd(sel.Start);
break;
}

Expand Down Expand Up @@ -112,7 +112,7 @@ internal static void InsertChar(char c, ref char deletedChar, TextSource ts)
{
deletedChar = ts[tb.Selection.Start.iLine][tb.Selection.Start.iChar - 1].c;
ts[tb.Selection.Start.iLine].RemoveAt(tb.Selection.Start.iChar - 1);
tb.Selection.Start = new Place(tb.Selection.Start.iChar - 1, tb.Selection.Start.iLine);
tb.Selection.SetStartAndEnd(new Place(tb.Selection.Start.iChar - 1, tb.Selection.Start.iLine));
}
break;
case '\t':
Expand All @@ -123,11 +123,11 @@ internal static void InsertChar(char c, ref char deletedChar, TextSource ts)
for (int i = 0; i < spaceCountNextTabStop; i++)
ts[tb.Selection.Start.iLine].Insert(tb.Selection.Start.iChar, new Char(' '));

tb.Selection.Start = new Place(tb.Selection.Start.iChar + spaceCountNextTabStop, tb.Selection.Start.iLine);
tb.Selection.SetStartAndEnd(new Place(tb.Selection.Start.iChar + spaceCountNextTabStop, tb.Selection.Start.iLine));
break;
default:
ts[tb.Selection.Start.iLine].Insert(tb.Selection.Start.iChar, new Char(c));
tb.Selection.Start = new Place(tb.Selection.Start.iChar + 1, tb.Selection.Start.iLine);
tb.Selection.SetStartAndEnd(new Place(tb.Selection.Start.iChar + 1, tb.Selection.Start.iLine));
break;
}
}
Expand All @@ -144,7 +144,7 @@ internal static void InsertLine(TextSource ts)
else
BreakLines(tb.Selection.Start.iLine, tb.Selection.Start.iChar, ts);

tb.Selection.Start = new Place(0, tb.Selection.Start.iLine + 1);
tb.Selection.SetStartAndEnd(new Place(0, tb.Selection.Start.iLine + 1));
ts.NeedRecalc(new TextSource.TextChangedEventArgs(0, 1));
}

Expand Down Expand Up @@ -172,7 +172,7 @@ internal static void MergeLines(int i, TextSource ts)
ts[i].AddRange(ts[i + 1]);
ts.RemoveLine(i + 1);
}
tb.Selection.Start = new Place(pos, i);
tb.Selection.SetStartAndEnd(new Place(pos, i));
ts.NeedRecalc(new TextSource.TextChangedEventArgs(0, 1));
}

Expand Down Expand Up @@ -238,11 +238,11 @@ internal static void InsertText(string insertedText, TextSource ts)
{
tb.Selection.BeginUpdate();
char cc = '\x0';

if (ts.Count == 0)
{
InsertCharCommand.InsertLine(ts);
tb.Selection.Start = Place.Empty;
tb.Selection.SetStartAndEnd(Place.Empty);
}
tb.ExpandBlock(tb.Selection.Start.iLine);
var len = insertedText.Length;
Expand Down Expand Up @@ -311,7 +311,7 @@ public override void Undo()
tb.Selection.BeginUpdate();
for (int i = 0; i<ranges.Count; i++)
{
tb.Selection.Start = ranges[i].Start;
tb.Selection.SetStartAndEnd(ranges[i].Start);
for (int j = 0; j < insertedText.Length; j++)
tb.Selection.GoRight(true);
ClearSelected(ts);
Expand Down Expand Up @@ -407,7 +407,7 @@ public ClearSelectedCommand(TextSource ts): base(ts)
/// </summary>
public override void Undo()
{
ts.CurrentTB.Selection.Start = new Place(sel.FromX, Math.Min(sel.Start.iLine, sel.End.iLine));
ts.CurrentTB.Selection.SetStartAndEnd(new Place(sel.FromX, Math.Min(sel.Start.iLine, sel.End.iLine)));
ts.OnTextChanging();
InsertTextCommand.InsertText(deletedText, ts);
ts.OnTextChanged(sel.Start.iLine, sel.End.iLine);
Expand Down Expand Up @@ -455,7 +455,7 @@ internal static void ClearSelected(TextSource ts)
InsertCharCommand.MergeLines(fromLine, ts);
}
//
tb.Selection.Start = new Place(fromChar, fromLine);
tb.Selection.SetStartAndEnd(new Place(fromChar, fromLine));
//
ts.NeedRecalc(new TextSource.TextChangedEventArgs(fromLine, toLine));
}
Expand Down Expand Up @@ -512,7 +512,7 @@ public override void Undo()
tb.Selection.BeginUpdate();
for (int i = 0; i < ranges.Count; i++)
{
tb.Selection.Start = ranges[i].ReplacedRange.Start;
tb.Selection.SetStartAndEnd(ranges[i].ReplacedRange.Start);
for (int j = 0; j < ranges[i].ReplaceText.Length; j++)
tb.Selection.GoRight(true);
ClearSelectedCommand.ClearSelected(ts);
Expand Down Expand Up @@ -597,12 +597,12 @@ public override void Undo()
var iLine = iLines[i];

if(iLine < ts.Count)
tb.Selection.Start = new Place(0, iLine);
tb.Selection.SetStartAndEnd(new Place(0, iLine));
else
tb.Selection.Start = new Place(ts[ts.Count - 1].Count, ts.Count - 1);
tb.Selection.SetStartAndEnd(new Place(ts[ts.Count - 1].Count, ts.Count - 1));

InsertCharCommand.InsertLine(ts);
tb.Selection.Start = new Place(0, iLine);
tb.Selection.SetStartAndEnd(new Place(0, iLine));
var text = prevText[prevText.Count - i - 1];
InsertTextCommand.InsertText(text, ts);
ts[iLine].IsChanged = true;
Expand Down Expand Up @@ -633,12 +633,12 @@ public override void Execute()
for(int i = iLines.Count - 1; i >= 0; i--)
{
var iLine = iLines[i];

prevText.Add(ts[iLine].Text);//backward
ts.RemoveLine(iLine);
//ts.OnTextChanged(ranges[i].Start.iLine, ranges[i].End.iLine);
}
tb.Selection.Start = new Place(0, 0);
tb.Selection.SetStartAndEnd(new Place(0, 0));
tb.Selection.EndUpdate();
ts.NeedRecalc(new TextSource.TextChangedEventArgs(0, 1));

Expand Down
Loading