[orca/570658] Added a formatting string for custom handling of radio buttons.



commit f08abdf93f6eb454f0854a3a384fa1ffb43b207c
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Sun Jul 5 16:35:30 2009 -0400

    Added a formatting string for custom handling of radio buttons.
    
    This solves the regression in the moz_tabpanel.py test in which
    the label associated with the radio button was presented three
    times.

 src/orca/scripts/toolkits/Gecko/formatting.py |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/formatting.py b/src/orca/scripts/toolkits/Gecko/formatting.py
index 4c1a2e5..a043bc4 100644
--- a/src/orca/scripts/toolkits/Gecko/formatting.py
+++ b/src/orca/scripts/toolkits/Gecko/formatting.py
@@ -119,6 +119,19 @@ formatting = {
             'unfocused': '[Component(obj,\
                                      asString(label + focusedItem + roleName),\
                                      asString(label) and (len(asString(label)) + 1) or 0)]'
+        },
+        # If we're in document content, we present the indicator followed
+        # immediately by the role, followed by the label/displayed text,
+        # etc. The label/displayed text is obtained as part of the line
+        # contents, therefore we do not want to include it here.
+        #
+        pyatspi.ROLE_RADIO_BUTTON: {
+            'unfocused': '[Component(obj,\
+                                     asString((not inDocumentContent\
+                                               and ((label + displayedText) or description)\
+                                               or [""])\
+                                             + roleName),\
+                                   indicator=asString(radioState))]'
         }
     }
 }



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