OSDN Git Service

Implement next and previous properties for IME candidate items allowing object naviga...
authorMichael Curran <mick@kulgan.net>
Mon, 13 Aug 2012 02:22:45 +0000 (12:22 +1000)
committerMichael Curran <mick@kulgan.net>
Mon, 13 Aug 2012 02:22:45 +0000 (12:22 +1000)
source/NVDAObjects/inputComposition.py

index 8230df7..4e1f575 100644 (file)
@@ -119,8 +119,6 @@ class CandidateList(Window):
 class CandidateItem(CandidateItemBehavior,Window):\r
 \r
        role=controlTypes.ROLE_LISTITEM\r
-       next=None\r
-       previous=None\r
        firstChild=None\r
        lastChild=None\r
        states=set()\r
@@ -146,3 +144,11 @@ class CandidateItem(CandidateItemBehavior,Window):
 \r
        def _get_description(self):\r
                return self.getSymbolDescriptions(self.candidateStrings[self.candidateIndex])\r
+\r
+       def _get_next(self):\r
+               if self.candidateIndex<(len(self.candidateStrings)-1):\r
+                       return CandidateItem(parent=self.parent,candidateStrings=self.candidateStrings,candidateIndex=self.candidateIndex+1)\r
+\r
+       def _get_previous(self):\r
+               if self.candidateIndex>0:\r
+                       return CandidateItem(parent=self.parent,candidateStrings=self.candidateStrings,candidateIndex=self.candidateIndex-1)\r