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 braille next line command for documents of Notepad++ #17431

Merged
merged 9 commits into from
Nov 27, 2024
Merged

Fix braille next line command for documents of Notepad++ #17431

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ee707a5
Fix collapse for textInfo in Notepad++
nvdaes Nov 23, 2024
b2ff5d4
Add docstring to collapse method for Scintilla TextInfo
nvdaes Nov 24, 2024
7f1e618
Update changelog
nvdaes Nov 24, 2024
eba8cd2
Don't expand to line when collapsing to end in Scintilla TextInfo if …
nvdaes Nov 24, 2024
cdcd270
Improve documentation
nvdaes Nov 24, 2024
4558194
Improve documentation
nvdaes Nov 24, 2024
1428e4c
Update user_docs/en/changes.md
nvdaes Nov 24, 2024
f01dd6b
Improve changelog
nvdaes Nov 24, 2024
14ac7e7
Apply suggestions from code review
nvdaes Nov 26, 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
10 changes: 10 additions & 0 deletions source/NVDAObjects/window/scintilla.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,16 @@ def _getCharacterOffsets(self, offset):
tempOffset -= 1
return [start, end]

def collapse(self, end=False):
nvdaes marked this conversation as resolved.
Show resolved Hide resolved
"""Before collapsing to end, if no text is selected, TextInfo is expanded to line.
This fixes a bug where next braille line command didn't move the cursor to the last empty line
in Notepad++ documents.
https://github.com/nvaccess/nvda/issues/17430
"""
if end and self.obj.makeTextInfo(textInfos.POSITION_SELECTION).isCollapsed:
self.expand(textInfos.UNIT_LINE)
super().collapse(end=end)


# The Scintilla NVDA object, inherists the generic MSAA NVDA object
class Scintilla(EditableTextWithAutoSelectDetection, Window):
Expand Down
5 changes: 3 additions & 2 deletions user_docs/en/changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ Specifically, MathML inside of span and other elements that have the attribute `
* If the plugins are reloaded while a browseable message is opened, NVDA will no longer fail to report subsequent focus moves. (#17323, @CyrilleB79)
* When using applications such as Skype, Discord, Signal and Phone Link for audio communication, NVDA speech and sounds no longer decrease in volume. (#17349, @jcsteh)
* Opening the NVDA Python Console will no longer fail in case an error occurs while retrieving snapshot variables. (#17391, @CyrilleB79)
* In Notepad and other UIA documents on Windows 11, if the last line is empty, the `braille next line command` will move the cursor to the last line.
In any document, if the cursor is on the last line, it will be moved to the end when using this command. (#17251, @nvdaes)
* In Notepad and other UIA documents, and Notepad++ on Windows 11, if the last line is empty, the `braille next line command` will move the cursor to the last line.
In any document, if the cursor is on the last line, it will be moved to the end when using this command. (#17251, #17430, @nvdaes)
nvdaes marked this conversation as resolved.
Show resolved Hide resolved

### Changes for Developers

Expand Down Expand Up @@ -116,6 +116,7 @@ As the NVDA update check URL is now configurable directly within NVDA, no replac
* `SymphonyDocument.script_toggleTextAttribute` to `SymphonyDocument.script_changeTextFormatting`
* The `space` keyword argument for `brailleDisplayDrivers.seikantk.InputGesture` now expects an `int` rather than a `bool`. (#17047, @school510587)
* The `[upgrade]` configuration section including `[upgrade][newLaptopKeyboardLayout]` has been removed. (#17191)
* in `NVDAObjects.window.scintilla.ScintillaTextInfo`, if no text is selected, the `collapse` method is overriden to expand to line if the `end` parameter is set to `True` (#17431, @nvdaes)

#### Deprecations

Expand Down