Changeset 2393

Timestamp:

09/25/08 09:51:31 (3 months ago)

Author:

mdcurran

Message:

speech.speakSelectionChanges: If the selection expands from collapsed, just speak the entire selection as one chunk. Same when the selection goes from expanded to collapsed, just speak the unselection as one chunk. Previously if the selection expanded out both ways at the same time, NVDA would announce two selections, one after each other. Same with unselecting, to a mid point, NVDA would announce two unselections. A good example of this is an edit field with a few words and where the caret is on the middle word and then you do ctrl+a to select all, NVDA would have previously annopunced two chunks, now it just announces one.

Files:

• trunk/source/speech.py (modified) (1 diff)

trunk/source/speech.py

@@ -287 +287 @@
         endToStart=newInfo.compareEndPoints(oldInfo,"endToStart")
         endToEnd=newInfo.compareEndPoints(oldInfo,"endToEnd")
-        if startToEnd>0 or endToStart<0:
-                if speakSelected and not newInfo.isCollapsed:
-                        selectedTextList.append(newInfo.text)
-                if speakUnselected and not oldInfo.isCollapsed:
-                        unselectedTextList.append(oldInfo.text)
-        else:
-                if speakSelected and startToStart<0 and not newInfo.isCollapsed:
-                        tempInfo=newInfo.copy()
-                        tempInfo.setEndPoint(oldInfo,"endToStart")
-                        selectedTextList.append(tempInfo.text)
-                if speakSelected and endToEnd>0 and not newInfo.isCollapsed:
-                        tempInfo=newInfo.copy()
-                        tempInfo.setEndPoint(oldInfo,"startToEnd")
-                        selectedTextList.append(tempInfo.text)
-                if startToStart>0 and not oldInfo.isCollapsed:
-                        tempInfo=oldInfo.copy()
-                        tempInfo.setEndPoint(newInfo,"endToStart")
-                        unselectedTextList.append(tempInfo.text)
-                if endToEnd<0 and not oldInfo.isCollapsed:
-                        tempInfo=oldInfo.copy()
-                        tempInfo.setEndPoint(newInfo,"startToEnd")
-                        unselectedTextList.append(tempInfo.text)
+        if speakSelected and oldInfo.isCollapsed:
+                selectedTextList.append(newInfo.text)
+        elif speakUnselected and newInfo.isCollapsed:
+                unselectedTextList.append(oldInfo.text)
+        else:
+                if startToEnd>0 or endToStart<0:
+                        if speakSelected and not newInfo.isCollapsed:
+                                selectedTextList.append(newInfo.text)
+                        if speakUnselected and not oldInfo.isCollapsed:
+                                unselectedTextList.append(oldInfo.text)
+                else:
+                        if speakSelected and startToStart<0 and not newInfo.isCollapsed:
+                                tempInfo=newInfo.copy()
+                                tempInfo.setEndPoint(oldInfo,"endToStart")
+                                selectedTextList.append(tempInfo.text)
+                        if speakSelected and endToEnd>0 and not newInfo.isCollapsed:
+                                tempInfo=newInfo.copy()
+                                tempInfo.setEndPoint(oldInfo,"startToEnd")
+                                selectedTextList.append(tempInfo.text)
+                        if startToStart>0 and not oldInfo.isCollapsed:
+                                tempInfo=oldInfo.copy()
+                                tempInfo.setEndPoint(newInfo,"endToStart")
+                                unselectedTextList.append(tempInfo.text)
+                        if endToEnd<0 and not oldInfo.isCollapsed:
+                                tempInfo=oldInfo.copy()
+                                tempInfo.setEndPoint(newInfo,"startToEnd")
+                                unselectedTextList.append(tempInfo.text)
         if speakSelected:
                 if not generalize: