Skip to content

Fix screen readers reading the wrong line on blank lines in textboxes (closes #7190) #11509

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

Open
trypsynth wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −2
Open

Fix screen readers reading the wrong line on blank lines in textboxes (closes #7190) #11509

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions ...icrosoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/TextRangeAdaptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,8 +607,11 @@ private void ExpandToEnclosingUnit(TextUnit unit, bool expandStart, bool expandE
_start = lineRange.Start.CreatePointer();
}
// If this line contains also end position, move it to the
// end of this line.
if (lineRange.Contains(_end))
// end of this line. Also handle blank/empty lines where
// lineRange.Start == lineRange.End (ContentLength == 0):
// snap _end to the blank line boundary so expandEnd doesn't
// bleed into the next line.
if (lineRange.Contains(_end) || lineRange.Start.CompareTo(lineRange.End) == 0)
{
snapEndPosition = false;
if (_end.CompareTo(lineRange.End) != 0)
Expand Down