orca r3450 - in trunk: . src/orca

[joanied svn gnome org]

Author: joanied
Date: Fri Jan 11 23:35:27 2008
New Revision: 3450
URL: http://svn.gnome.org/viewvc/orca?rev=3450&view=rev

Log:
2008-01-11  Joanmarie Diggs <joanmarie diggs gmail com>

        * src/orca/Gecko.py: 
          Work on bug #508784 - Orca needs to handle FF hierarchies
          that don't match reality.  Part of the solution is making
          sure the user can navigate to the areas.  That is what has
          been done.  We still need to present the elements and allow
          the user to navigate among them according to their spatial
          layout (e.g. reverse the list whose elements are ordered
          right-to-left).



Modified:
   trunk/ChangeLog
   trunk/src/orca/Gecko.py

Modified: trunk/src/orca/Gecko.py
==============================================================================
--- trunk/src/orca/Gecko.py	(original)
+++ trunk/src/orca/Gecko.py	Fri Jan 11 23:35:27 2008
@@ -7285,22 +7285,17 @@
                        and extents != objExtents:
                         objects.extend(toAdd)
 
-        # [[[TODO - JD: Check to see that the last object that claimed
-        # to be on this line really is on the line.  See Mozilla bug
-        # 405258.]]]
-        #
-        if len(objects):
-            first = objects[0]
-            firstExtents = self.getExtents(first[0], first[1], first[2])
-            done = False
-            while not done:
-                last = objects[-1]
-                lastExtents = self.getExtents(last[0], last[1], last[2])
-                if not self.onSameLine(firstExtents, lastExtents) \
-                   and obj.getRole() != pyatspi.ROLE_TABLE_CELL:
-                    objects.pop()
-                else:
-                    done = True
+        # Check to see that the objects that claimed to be on this line
+        # really are on the same line as what we started with.
+        #
+        while len(objects) > 1:
+            last = objects[-1]
+            lastExtents = self.getExtents(last[0], last[1], last[2])
+            if not self.onSameLine(extents, lastExtents) \
+               and obj.getRole() != pyatspi.ROLE_TABLE_CELL:
+                objects.pop()
+            else:
+                break
 
         # [[[TODO - JD: We're getting the newline character at the end
         # of links and other objects.  Ultimately, we might want to keep