tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix text edit shortcuts 

Fix caret rendering at line ends
pull/7693/head
Benedikt Stebner 4 years ago
parent
cf40772dd1
commit
bfae67dbdb
5 changed files with 51 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      src/Avalonia.Controls/Presenters/TextPresenter.cs
  2. 4
      src/Avalonia.Controls/TextBlock.cs
  3. 60
      src/Avalonia.Controls/TextBox.cs
  4. 2
      src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs
  5. 2
      src/Avalonia.Visuals/Media/TextFormatting/TextLineImpl.cs

18
src/Avalonia.Controls/Presenters/TextPresenter.cs
View File

@ -394,10 +394,14 @@ namespace Avalonia.Controls.Presenters
var x = Math.Floor(_caretBounds.X) + 0.5;
var y = Math.Floor(_caretBounds.Y) + 0.5;
var b = Math.Ceiling(_caretBounds.Bottom) - 0.5;
var caretIndex = _lastCharacterHit.FirstCharacterIndex + _lastCharacterHit.TrailingLength;
var lineIndex = TextLayout.GetLineIndexFromCharacterIndex(caretIndex, _lastCharacterHit.TrailingLength > 0);
var textLine = TextLayout.TextLines[lineIndex];
if (x >= Bounds.Width)
if (_caretBounds.X > 0 && _caretBounds.X >= textLine.WidthIncludingTrailingWhitespace)
{
x = Math.Floor(_caretBounds.X - 1) + 0.5;
x -= 1;
}
return (new Point(x, y), new Point(x, b));
@ -468,8 +472,8 @@ namespace Avalonia.Controls.Presenters
var typeface = new Typeface(FontFamily, FontStyle, FontWeight);
var selectionStart = SelectionStart;
var selectionEnd = SelectionEnd;
var selectionStart = CoerceCaretIndex(SelectionStart);
var selectionEnd = CoerceCaretIndex(SelectionEnd);
var start = Math.Min(selectionStart, selectionEnd);
var length = Math.Max(selectionStart, selectionEnd) - start;
@ -512,11 +516,9 @@ namespace Avalonia.Controls.Presenters
_textLayout = null;
InvalidateArrange();
var scale = LayoutHelper.GetLayoutScale(this);
var measuredSize = PixelSize.FromSize(TextLayout.Bounds.Size, scale);
var measuredSize = PixelSize.FromSize(TextLayout.Bounds.Size, 1);
return new Size(measuredSize.Width, measuredSize.Height);
}

4
src/Avalonia.Controls/TextBlock.cs
View File

@ -550,10 +550,8 @@ namespace Avalonia.Controls
_textLayout = null;
InvalidateArrange();
var scale = LayoutHelper.GetLayoutScale(this);
var measuredSize = PixelSize.FromSize(TextLayout.Bounds.Size, scale);
var measuredSize = PixelSize.FromSize(TextLayout.Bounds.Size, 1);
return new Size(measuredSize.Width, measuredSize.Height).Inflate(padding);
}

60
src/Avalonia.Controls/TextBox.cs
View File

@ -256,6 +256,8 @@ namespace Avalonia.Controls
UndoRedoState state;
if (IsUndoEnabled && _undoRedoHelper.TryGetLastState(out state) && state.Text == Text)
_undoRedoHelper.UpdateLastState();
SelectionStart = SelectionEnd = value;
}
}
@ -300,14 +302,15 @@ namespace Avalonia.Controls
{
value = CoerceCaretIndex(value);
var changed = SetAndRaise(SelectionStartProperty, ref _selectionStart, value);
if (changed)
{
UpdateCommandStates();
}
if (value == SelectionEnd)
if (SelectionEnd == value && CaretIndex != value)
{
CaretIndex = SelectionStart;
CaretIndex = value;
}
}
}
@ -328,8 +331,8 @@ namespace Avalonia.Controls
{
UpdateCommandStates();
}
if (value == SelectionStart)
if (SelectionStart == value && CaretIndex != value)
{
CaretIndex = value;
}
@ -352,8 +355,6 @@ namespace Avalonia.Controls
{
var caretIndex = CaretIndex;
SelectionStart = CoerceCaretIndex(SelectionStart, value);
SelectionEnd = CoerceCaretIndex(SelectionEnd, value);
CaretIndex = CoerceCaretIndex(caretIndex, value);
if (SetAndRaise(TextProperty, ref _text, value) && IsUndoEnabled && !_isUndoingRedoing)
@ -457,7 +458,7 @@ namespace Avalonia.Controls
/// </summary>
public void ClearSelection()
{
SelectionStart = SelectionEnd = CaretIndex;
CaretIndex = SelectionStart;
}
/// <summary>
@ -855,6 +856,7 @@ namespace Avalonia.Controls
movement = true;
selection = false;
handled = true;
CaretIndex = _presenter.CaretIndex;
}
else if (Match(keymap.MoveCursorToTheEndOfDocument))
{
@ -862,6 +864,7 @@ namespace Avalonia.Controls
movement = true;
selection = false;
handled = true;
CaretIndex = _presenter.CaretIndex;
}
else if (Match(keymap.MoveCursorToTheStartOfLine))
{
@ -869,7 +872,7 @@ namespace Avalonia.Controls
movement = true;
selection = false;
handled = true;
CaretIndex = _presenter.CaretIndex;
}
else if (Match(keymap.MoveCursorToTheEndOfLine))
{
@ -877,6 +880,7 @@ namespace Avalonia.Controls
movement = true;
selection = false;
handled = true;
CaretIndex = _presenter.CaretIndex;
}
else if (Match(keymap.MoveCursorToTheStartOfDocumentWithSelection))
{
@ -949,7 +953,7 @@ namespace Avalonia.Controls
}
else
{
SelectionStart = SelectionEnd = _presenter.CaretIndex;
CaretIndex = _presenter.CaretIndex;
}
break;
@ -971,7 +975,7 @@ namespace Avalonia.Controls
}
else
{
SelectionStart = SelectionEnd = _presenter.CaretIndex;
CaretIndex = _presenter.CaretIndex;
}
break;
@ -995,6 +999,8 @@ namespace Avalonia.Controls
SetTextInternal(text.Substring(0, length) +
text.Substring(caretIndex));
CaretIndex = _presenter.CaretIndex;
}
SnapshotUndoRedo();
@ -1069,8 +1075,6 @@ namespace Avalonia.Controls
{
e.Handled = true;
}
CaretIndex = _presenter.CaretIndex;
}
protected override void OnPointerPressed(PointerPressedEventArgs e)
@ -1233,7 +1237,7 @@ namespace Avalonia.Controls
private void MoveHorizontal(int direction, bool wholeWord, bool isSelecting)
{
var text = Text ?? string.Empty;
var selectionStart = SelectionStart;
var selectionEnd = SelectionEnd;
if (!wholeWord)
{
@ -1259,14 +1263,19 @@ namespace Avalonia.Controls
if (direction > 0)
{
offset = StringUtils.NextWord(text, selectionStart) - selectionStart;
offset = StringUtils.NextWord(text, selectionEnd) - selectionEnd;
}
else
{
offset = StringUtils.PreviousWord(text, selectionStart) - selectionStart;
offset = StringUtils.PreviousWord(text, selectionEnd) - selectionEnd;
}
SelectionEnd = CaretIndex + offset;
SelectionEnd += offset;
if (!isSelecting)
{
CaretIndex = SelectionEnd;
}
}
}
@ -1310,8 +1319,13 @@ namespace Avalonia.Controls
else
{
var textLines = _presenter.TextLayout.TextLines;
var lineIndex = _presenter.TextLayout.GetLineIndexFromCharacterIndex(caretIndex, false);
var lineIndex = _presenter.TextLayout.GetLineIndexFromCharacterIndex(caretIndex, true);
var textLine = textLines[lineIndex];
if (caretIndex == textLine.TextRange.Start + textLine.TextRange.Length && lineIndex + 1 < textLines.Count)
{
textLine = textLines[++lineIndex];
}
_presenter.MoveCaretToTextPosition(textLine.TextRange.Start + textLine.TextRange.Length, true);
}
@ -1324,7 +1338,6 @@ namespace Avalonia.Controls
{
SelectionStart = 0;
SelectionEnd = Text?.Length ?? 0;
CaretIndex = SelectionEnd;
}
private bool DeleteSelection(bool raiseTextChanged = true)
@ -1340,12 +1353,13 @@ namespace Avalonia.Controls
var end = Math.Max(selectionStart, selectionEnd);
var text = Text!;
SetTextInternal(text.Substring(0, start) + text.Substring(end), raiseTextChanged);
CaretIndex = start;
CaretIndex= start;
ClearSelection();
return true;
}
else
{
CaretIndex = SelectionStart;
return false;
}
}
@ -1393,9 +1407,11 @@ namespace Avalonia.Controls
private void SetSelectionForControlBackspace()
{
SelectionStart = CaretIndex;
var selectionStart = CaretIndex;
MoveHorizontal(-1, true, false);
SelectionStart = selectionStart;
}
private void SetSelectionForControlDelete()
@ -1407,7 +1423,7 @@ namespace Avalonia.Controls
SelectionStart = CaretIndex;
MoveHorizontal(1, true, false);
MoveHorizontal(1, true, true);
if (SelectionEnd < _text.Length && _text[SelectionEnd] == ' ')
{

2
src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs
View File

@ -607,7 +607,7 @@ namespace Avalonia.Media.TextFormatting
textLines.Add(textLine);
UpdateBounds(textLine,ref left, ref width, ref height);
UpdateBounds(textLine, ref left, ref width, ref height);
previousLine = textLine;

2
src/Avalonia.Visuals/Media/TextFormatting/TextLineImpl.cs
View File

@ -553,7 +553,7 @@ namespace Avalonia.Media.TextFormatting
out _);
var isAtEnd = foundCharacterHit.FirstCharacterIndex + foundCharacterHit.TrailingLength ==
TextRange.Length;
TextRange.Start + TextRange.Length;
if (isAtEnd && !run.GlyphRun.IsLeftToRight)
{

Write Preview
Loading…
Cancel
Save