[orca] Ensure we present the name of focused web documents
- From: Joanmarie Diggs <joanied src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca] Ensure we present the name of focused web documents
- Date: Mon, 30 Mar 2020 22:03:48 +0000 (UTC)
commit d548612ca27431937fd13bd2c68e5d01241fbffe
Author: Joanmarie Diggs <jdiggs igalia com>
Date: Mon Mar 30 17:59:47 2020 -0400
Ensure we present the name of focused web documents
When the document itself claims focus we were just saying "document web"
even when the document had a meaningful accessible name, e.g. in VSCode.
This new behavior might not be desirable across the board, however, so
we'll adjust as feedback comes in.
src/orca/formatting.py | 12 ++++++------
src/orca/scripts/web/speech_generator.py | 1 +
2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index 4ab1425e6..e4319801d 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -216,14 +216,14 @@ formatting = {
'unfocused': '(expandedEOCs or (labelOrName + roleName + (unrelatedLabels or description)))'
},
pyatspi.ROLE_DOCUMENT_FRAME: {
- 'unfocused': 'label + readOnly + textRole + currentLineText + anyTextSelection + ' + MNEMONIC,
- 'basicWhereAmI': 'label + readOnly + textRole + textContent + anyTextSelection + ' + MNEMONIC,
- 'detailedWhereAmI': 'label + readOnly + textRole + textContentWithAttributes + anyTextSelection
+ ' + MNEMONIC
+ 'unfocused': 'labelOrName + readOnly + textRole + currentLineText + anyTextSelection + ' +
MNEMONIC,
+ 'basicWhereAmI': 'labelOrName + readOnly + textRole + textContent + anyTextSelection + ' +
MNEMONIC,
+ 'detailedWhereAmI': 'labelOrName + readOnly + textRole + textContentWithAttributes +
anyTextSelection + ' + MNEMONIC
},
pyatspi.ROLE_DOCUMENT_WEB: {
- 'unfocused': 'label + readOnly + textRole + currentLineText + anyTextSelection + ' + MNEMONIC,
- 'basicWhereAmI': 'label + readOnly + textRole + textContent + anyTextSelection + ' + MNEMONIC,
- 'detailedWhereAmI': 'label + readOnly + textRole + textContentWithAttributes + anyTextSelection
+ ' + MNEMONIC
+ 'unfocused': 'labelOrName + readOnly + textRole + currentLineText + anyTextSelection + ' +
MNEMONIC,
+ 'basicWhereAmI': 'labelOrName + readOnly + textRole + textContent + anyTextSelection + ' +
MNEMONIC,
+ 'detailedWhereAmI': 'labelorName + readOnly + textRole + textContentWithAttributes +
anyTextSelection + ' + MNEMONIC
},
'ROLE_DPUB_LANDMARK': {
'focused': 'leaving or labelOrName',
diff --git a/src/orca/scripts/web/speech_generator.py b/src/orca/scripts/web/speech_generator.py
index e954df0e7..a58d72a76 100644
--- a/src/orca/scripts/web/speech_generator.py
+++ b/src/orca/scripts/web/speech_generator.py
@@ -311,6 +311,7 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
if self._script.utilities.isTextBlockElement(obj) \
and not self._script.utilities.isLandmark(obj) \
+ and not self._script.utilities.isDocument(obj) \
and not self._script.utilities.isDPub(obj) \
and not self._script.utilities.isContentSuggestion(obj):
return []
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]