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 scrolling to anchor links pointing to the object containing the virtual caret #17676

Merged
merged 7 commits into from
Feb 11, 2025
Merged

Fix scrolling to anchor links pointing to the object containing the virtual caret #17676

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f9823df
Before scrolling in browse mode, check if the caret is in the first l…
nvdaes Feb 5, 2025
e4128b4
Use Sphinx style to describe parameters
nvdaes Feb 5, 2025
e7df212
Update changelog
nvdaes Feb 5, 2025
d6c3db5
Merge remote-tracking branch 'nvaccess/master' into fixBrowseModeScro…
nvdaes Feb 6, 2025
b2bf0bf
Apply suggestions from code review
nvdaes Feb 11, 2025
128be8f
Fix Spynx format addressing review
nvdaes Feb 11, 2025
32f96ea
Update source/browseMode.py
seanbudd Feb 11, 2025
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
11 changes: 6 additions & 5 deletions source/browseMode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2108,8 +2108,8 @@ def _handleScrollTo(
"""Handle scrolling the browseMode document to a given object in response to an event.
Subclasses should call this from an event which indicates that the document has scrolled.
@postcondition: The virtual caret is moved to L{obj} and the buffer content for L{obj} is reported.
@param obj: The object to which the document should scroll.
@return: C{True} if the document was scrolled, C{False} if not.
:param obj: The object to which the document should scroll.
:return: C{True} if the document was scrolled, C{False} if not.
@note: If C{False} is returned, calling events should probably call their nextHandler.
"""
if (
Expand All @@ -2132,13 +2132,14 @@ def _handleScrollTo(
else:
raise ValueError(f"{obj} is not a supported type")

# We only want to update the caret and speak the field if we're not in the same one as before
# We only want to update the caret and speak the field if we're not in the first line of the same object as before.
# See https://github.com/nvaccess/nvda/issues/17669
scrollInfo.collapse()
scrollInfo.expand(textInfos.UNIT_LINE)
caretInfo = self.makeTextInfo(textInfos.POSITION_CARET)
# Expand to one character, as isOverlapping() doesn't treat, for example, (4,4) and (4,5) as overlapping.
caretInfo.expand(textInfos.UNIT_CHARACTER)
if not scrollInfo.isOverlapping(caretInfo):
if scrollInfo.isCollapsed:
scrollInfo.expand(textInfos.UNIT_LINE)
speech.speakTextInfo(scrollInfo, reason=OutputReason.CARET)
scrollInfo.collapse()
self.selection = scrollInfo
Expand Down
1 change: 1 addition & 0 deletions user_docs/en/changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ In any document, if the cursor is on the last line, it will be moved to the end
* Fix issue with certain section elements not being recognized as editable controls in Visual Studio Code. (#17573, @Cary-rowen)
* Fixed an issue where continuous reading (say all) stopped at the end of the first sentence when using some SAPI5 synthesizers. (#16691, @gexgd0419)
* In Visual Studio Code, NVDA no longer hijacks the `alt+upArrow` and `alt+downArrow` gestures for sentence navigation. (#17082, @LeonarddeR)
* When anchor links point to the same object as the virtual caret is placed, NVDA no longer fails to scroll to the link destination (#17669, @nvdaes)

### Changes for Developers

Expand Down