From 47765af1d278afd0bb515d01168933716767521f Mon Sep 17 00:00:00 2001 From: Bill Dengler Date: Thu, 8 Aug 2019 06:28:59 -0400 Subject: [PATCH 1/4] _TextInfo -> TextInfo --- source/NVDAObjects/UIA/winConsoleUIA.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/NVDAObjects/UIA/winConsoleUIA.py b/source/NVDAObjects/UIA/winConsoleUIA.py index b7f0c750cc0..f7b10ee91bb 100644 --- a/source/NVDAObjects/UIA/winConsoleUIA.py +++ b/source/NVDAObjects/UIA/winConsoleUIA.py @@ -235,7 +235,7 @@ class WinConsoleUIA(KeyboardHandlerBasedTypedCharSupport): #: Only process text changes every 30 ms, in case the console is getting #: a lot of text. STABILIZE_DELAY = 0.03 - _TextInfo = consoleUIATextInfo + TextInfo = consoleUIATextInfo #: the caret in consoles can take a while to move on Windows 10 1903 and later. _caretMovementTimeoutMultiplier = 1.5 From 6ff510abcdde0f465cbcee7d2902b1244175ca89 Mon Sep 17 00:00:00 2001 From: Bill Dengler Date: Mon, 12 Aug 2019 15:55:42 -0400 Subject: [PATCH 2/4] Review action. --- source/NVDAObjects/UIA/winConsoleUIA.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/NVDAObjects/UIA/winConsoleUIA.py b/source/NVDAObjects/UIA/winConsoleUIA.py index f7b10ee91bb..0da749f0bc9 100644 --- a/source/NVDAObjects/UIA/winConsoleUIA.py +++ b/source/NVDAObjects/UIA/winConsoleUIA.py @@ -235,6 +235,9 @@ class WinConsoleUIA(KeyboardHandlerBasedTypedCharSupport): #: Only process text changes every 30 ms, in case the console is getting #: a lot of text. STABILIZE_DELAY = 0.03 + #: Use our custom textInfo for UIA consoles. + #: This fixes expand/collapse, implements word movement, + # and bounds review to the visible text. TextInfo = consoleUIATextInfo #: the caret in consoles can take a while to move on Windows 10 1903 and later. _caretMovementTimeoutMultiplier = 1.5 From 4864469bde07061dd3bdef4c367e4fce7da5663c Mon Sep 17 00:00:00 2001 From: Bill Dengler Date: Tue, 13 Aug 2019 09:24:25 -0400 Subject: [PATCH 3/4] Update source/NVDAObjects/UIA/winConsoleUIA.py Co-Authored-By: Reef Turner --- source/NVDAObjects/UIA/winConsoleUIA.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/NVDAObjects/UIA/winConsoleUIA.py b/source/NVDAObjects/UIA/winConsoleUIA.py index 0da749f0bc9..3f1c665a96a 100644 --- a/source/NVDAObjects/UIA/winConsoleUIA.py +++ b/source/NVDAObjects/UIA/winConsoleUIA.py @@ -238,7 +238,11 @@ class WinConsoleUIA(KeyboardHandlerBasedTypedCharSupport): #: Use our custom textInfo for UIA consoles. #: This fixes expand/collapse, implements word movement, # and bounds review to the visible text. - TextInfo = consoleUIATextInfo + # Overriding _get_TextInfo and thus the TextInfo property on NVDAObjects.UIA.UIA + # consoleUIATextInfo fixes expand/collapse, implements word movement, and + # bounds review to the visible text. + def _get_TextInfo(self): + return consoleUIATextInfo #: the caret in consoles can take a while to move on Windows 10 1903 and later. _caretMovementTimeoutMultiplier = 1.5 From f94c5392b1ae4b7fc19951708657b6befcc23151 Mon Sep 17 00:00:00 2001 From: Bill Dengler Date: Tue, 13 Aug 2019 10:13:07 -0400 Subject: [PATCH 4/4] Style. --- source/NVDAObjects/UIA/winConsoleUIA.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/source/NVDAObjects/UIA/winConsoleUIA.py b/source/NVDAObjects/UIA/winConsoleUIA.py index 3f1c665a96a..63ff6af2a72 100644 --- a/source/NVDAObjects/UIA/winConsoleUIA.py +++ b/source/NVDAObjects/UIA/winConsoleUIA.py @@ -235,17 +235,16 @@ class WinConsoleUIA(KeyboardHandlerBasedTypedCharSupport): #: Only process text changes every 30 ms, in case the console is getting #: a lot of text. STABILIZE_DELAY = 0.03 - #: Use our custom textInfo for UIA consoles. - #: This fixes expand/collapse, implements word movement, - # and bounds review to the visible text. - # Overriding _get_TextInfo and thus the TextInfo property on NVDAObjects.UIA.UIA - # consoleUIATextInfo fixes expand/collapse, implements word movement, and - # bounds review to the visible text. - def _get_TextInfo(self): - return consoleUIATextInfo #: the caret in consoles can take a while to move on Windows 10 1903 and later. _caretMovementTimeoutMultiplier = 1.5 + def _get_TextInfo(self): + """Overriding _get_TextInfo and thus the TextInfo property + on NVDAObjects.UIA.UIA + consoleUIATextInfo fixes expand/collapse, implements word movement, and + bounds review to the visible text.""" + return consoleUIATextInfo + def _get_caretMovementDetectionUsesEvents(self): """Using caret events in consoles sometimes causes the last character of the prompt to be read when quickly deleting text."""