[orca] Provide the start and end offsets when calling scrollIntoView



commit eda6257a9ef71f71fa84da28cc527dab490789c4
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Tue Jul 2 12:40:09 2019 -0400

    Provide the start and end offsets when calling scrollIntoView

 src/orca/scripts/default.py                   | 2 +-
 src/orca/scripts/toolkits/WebKitGtk/script.py | 2 ++
 src/orca/scripts/web/script.py                | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index 848719c21..a0ac46010 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -3539,7 +3539,6 @@ class Script(script.Script):
         #
         done = False
         while not done:
-            eventsynthesizer.scrollIntoView(obj)
             speech.speak(self.speechGenerator.generateContext(obj, priorObj=priorObj))
 
             lastEndOffset = -1
@@ -3591,6 +3590,7 @@ class Script(script.Script):
                 context = speechserver.SayAllContext(
                     obj, lineString, startOffset, endOffset)
                 self._sayAllContexts.append(context)
+                eventsynthesizer.scrollIntoView(obj, startOffset, endOffset)
                 yield [context, voice]
 
             moreLines = False
diff --git a/src/orca/scripts/toolkits/WebKitGtk/script.py b/src/orca/scripts/toolkits/WebKitGtk/script.py
index 6207d98da..d3542fc9e 100644
--- a/src/orca/scripts/toolkits/WebKitGtk/script.py
+++ b/src/orca/scripts/toolkits/WebKitGtk/script.py
@@ -33,6 +33,7 @@ import pyatspi.utils as utils
 import orca.scripts.default as default
 import orca.cmdnames as cmdnames
 import orca.debug as debug
+import orca.eventsynthesizer as eventsynthesizer
 import orca.guilabels as guilabels
 import orca.input_event as input_event
 import orca.messages as messages
@@ -544,6 +545,7 @@ class Script(default.Script):
             for (string, start, end, voice) in textSegments:
                 context = speechserver.SayAllContext(textObj, string, start, end)
                 self._sayAllContexts.append(context)
+                eventsynthesizer.scrollIntoView(obj, start, end)
                 yield [context, voice]
 
             offset = 0
diff --git a/src/orca/scripts/web/script.py b/src/orca/scripts/web/script.py
index d4ffc56b4..a3b0bfe40 100644
--- a/src/orca/scripts/web/script.py
+++ b/src/orca/scripts/web/script.py
@@ -599,7 +599,6 @@ class Script(default.Script):
                 if self.utilities.isLabellingContents(obj):
                     continue
 
-                eventsynthesizer.scrollIntoView(obj)
                 utterances = self.speechGenerator.generateContents(
                     [content], eliminatePauses=True, priorObj=priorObj)
                 priorObj = obj
@@ -612,6 +611,7 @@ class Script(default.Script):
                     context = speechserver.SayAllContext(
                         obj, element, startOffset, endOffset)
                     self._sayAllContexts.append(context)
+                    eventsynthesizer.scrollIntoView(obj, startOffset, endOffset)
                     yield [context, voices[i]]
 
             lastObj, lastOffset = contents[-1][0], contents[-1][2]


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]