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

Jump to bottom

Handling Selection get/set in TextInputMethodClient #421

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+50 −6
Open

Handling Selection get/set in TextInputMethodClient #421

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
caf8083
Change TextInputMethodClient Selection
May 2, 2024
4b26b40
Remove not necessary checks
May 2, 2024
e42d97e
Merge branch 'master' into selection-change
Necromanika May 31, 2024
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
56 changes: 50 additions & 6 deletions src/AvaloniaEdit/Editing/TextArea.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1137,6 +1137,7 @@ public void RaiseScrollInvalidated(EventArgs e)
private class TextAreaTextInputMethodClient : TextInputMethodClient
{
private TextArea _textArea;
private TextSelection _emptySelection;

public TextAreaTextInputMethodClient()
{
Expand Down Expand Up @@ -1196,17 +1197,39 @@ public override TextSelection Selection
{
if (_textArea == null)
return new TextSelection(0, 0);
return new TextSelection(_textArea.Caret.Position.Column, _textArea.Caret.Position.Column + _textArea.Selection.Length);

if (_textArea.Selection.IsEmpty)
return _emptySelection;

var startLocation = _textArea.Selection.StartPosition.Location;
var endLocation = _textArea.Selection.EndPosition.Location;

var lineNumber = _textArea.Caret.Line;
var line = _textArea.Document.GetLineByNumber(lineNumber);

var selectionStart = startLocation.Line == lineNumber
? startLocation.Column - 1
: line.Offset;
var selectionEnd = endLocation.Line == lineNumber
? endLocation.Column - 1
: line.EndOffset;

return new TextSelection(selectionStart, selectionEnd);
}
set
{
if (_textArea == null) return;
var selection = _textArea.Selection;
if (selection.StartPosition.Line == 0) return;
var selection = _textArea.Selection;

var lineNumber = _textArea.Caret.Line;
var start = value.Start + 1;
var end = value.End + 1;

_textArea.Selection = selection.StartSelectionOrSetEndpoint(
new TextViewPosition(selection.StartPosition.Line, value.Start),
new TextViewPosition(selection.StartPosition.Line, value.End));
new TextViewPosition(lineNumber, start),
new TextViewPosition(lineNumber, end));

RaiseSelectionChanged();
}
}

Expand All @@ -1215,13 +1238,15 @@ public void SetTextArea(TextArea textArea)
if (_textArea != null)
{
_textArea.Caret.PositionChanged -= Caret_PositionChanged;
_textArea.SelectionChanged -= TextArea_SelectionChanged;
}

_textArea = textArea;

if (_textArea != null)
{
_textArea.Caret.PositionChanged += Caret_PositionChanged;
_textArea.SelectionChanged += TextArea_SelectionChanged;
}

RaiseTextViewVisualChanged();
Expand All @@ -1231,11 +1256,30 @@ public void SetTextArea(TextArea textArea)
RaiseSurroundingTextChanged();
}

private void TextArea_SelectionChanged(object sender, EventArgs e)
{
RaiseSelectionChanged();
}

private void Caret_PositionChanged(object sender, EventArgs e)
{
RaiseCursorRectangleChanged();
RaiseSurroundingTextChanged();
RaiseSelectionChanged();

if (_textArea.Selection.IsEmpty)
{
// We need to select something before empty selection so that the IME be able to complete/correct words
// Atleast while its working so
// Maybe this was designed for Avalonia TextBox where selection changing by two steps (start index, end index)
var currentSelectionIdx = _textArea.Caret.Position.Column - 1;

// Raise selection step by step to new location
_emptySelection.Start = currentSelectionIdx;
RaiseSelectionChanged();

_emptySelection.End = currentSelectionIdx;
RaiseSelectionChanged();
}
}

public override void SetPreeditText(string text)
Expand Down