[orca] Improve likelihood that we'll speak link role for descendant text object
- From: Joanmarie Diggs <joanied src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca] Improve likelihood that we'll speak link role for descendant text object
- Date: Thu, 16 May 2019 13:47:43 +0000 (UTC)
commit 2ff2f100405cdf275e3fff690757cbf29ff9f765
Author: Joanmarie Diggs <jdiggs igalia com>
Date: Thu May 16 15:46:29 2019 +0200
Improve likelihood that we'll speak link role for descendant text object
src/orca/scripts/web/speech_generator.py | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/src/orca/scripts/web/speech_generator.py b/src/orca/scripts/web/speech_generator.py
index 542b0742a..e5345422a 100644
--- a/src/orca/scripts/web/speech_generator.py
+++ b/src/orca/scripts/web/speech_generator.py
@@ -390,12 +390,10 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
return result
ancestorRoles = [pyatspi.ROLE_HEADING, pyatspi.ROLE_LINK]
- if index == total - 1 \
- and (role == pyatspi.ROLE_IMAGE or self._script.utilities.queryNonEmptyText(obj)):
- speakRoles = lambda x: x and x.getRole() in ancestorRoles
- ancestor = pyatspi.findAncestor(obj, speakRoles)
- if ancestor and ancestor.getRole() != role:
- result.extend(self._generateRoleName(ancestor))
+ speakRoles = lambda x: x and x.getRole() in ancestorRoles
+ ancestor = pyatspi.findAncestor(obj, speakRoles)
+ if ancestor and ancestor.getRole() != role and (index == total - 1 or obj.name == ancestor.name):
+ result.extend(self._generateRoleName(ancestor))
return result
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]