[orca] Check in the default script's onCaretMoved() if the caret really moved



commit 2901009070112611975f10b6ca6a0c24915187e0
Author: José Vilmar Estácio de Souza <vilmar informal com br>
Date:   Wed Nov 13 08:49:57 2013 -0200

    Check in the default script's onCaretMoved() if the caret really moved
    
    This keeps us from double-presenting the caret position when we get a
    focus-change event immediately followed by a caret-moved event.

 src/orca/scripts/apps/Eclipse/script.py |    6 ------
 src/orca/scripts/apps/soffice/script.py |    5 -----
 src/orca/scripts/default.py             |    5 +++++
 3 files changed, 5 insertions(+), 11 deletions(-)
---
diff --git a/src/orca/scripts/apps/Eclipse/script.py b/src/orca/scripts/apps/Eclipse/script.py
index efcdf77..97a8c31 100644
--- a/src/orca/scripts/apps/Eclipse/script.py
+++ b/src/orca/scripts/apps/Eclipse/script.py
@@ -46,12 +46,6 @@ class Script(GAIL.Script):
         otherObj. Overridden here so that we can give more feedback to user.
         """
 
-        # Ignore caret movements in a duplicate event if the ofsset is the same
-        obj, offset = self.pointOfReference.get("lastCursorPosition", (None, -1))
-        if offset == event.detail1 \
-           and self.utilities.isSameObject(obj, event.source):
-            return
-
         # Let the default script's normal behavior do its thing
         #
         GAIL.Script._presentTextAtNewCaretPosition(self, event, otherObj)
diff --git a/src/orca/scripts/apps/soffice/script.py b/src/orca/scripts/apps/soffice/script.py
index d2b9078..8066fcc 100644
--- a/src/orca/scripts/apps/soffice/script.py
+++ b/src/orca/scripts/apps/soffice/script.py
@@ -923,11 +923,6 @@ class Script(default.Script):
         if event.detail1 == -1:
             return
 
-        obj, offset = self.pointOfReference.get("lastCursorPosition", (None, -1))
-        if offset == event.detail1 \
-           and self.utilities.isSameObject(obj, event.source):
-            return
-
         if self.utilities.isCellBeingEdited(event.source):
             orca.setLocusOfFocus(event, event.source.parent)
 
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index 8930506..80be930 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -2151,6 +2151,11 @@ class Script(script.Script):
         if not orca_state.locusOfFocus:
             return
 
+        obj, offset = self.pointOfReference.get("lastCursorPosition", (None, -1))
+        if offset == event.detail1 \
+           and self.utilities.isSameObject(obj, event.source):
+            return
+
         # Should the event source be the locusOfFocus?
         #
         try:


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