Changeset 63769 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 8, 2016 2:55:37 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

110584

Message:

FE/Qt: bugref:6899: Accessibility support (step 19): Selector UI: Reworking details item acessibility interface to represent elements (not just sets and groups) as lists as well.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.cpp

@@ -28 +28 @@
 
 /* GUI includes: */
+# include "UIGraphicsTextPane.h"
 # include "UIGDetailsGroup.h"
 # include "UIGDetailsSet.h"
@@ -101 +102 @@
         AssertPtrReturn(item(), 0);
 
-        /* Return the number of set children: */
-        if (item()->type() == UIGDetailsItemType_Set)
-            return item()->items().size();
+        /* Return the number of children: */
+        switch (item()->type())
+        {
+            case UIGDetailsItemType_Set:     return item()->items().size();
+            case UIGDetailsItemType_Element: return item()->toElement()->text().size();
+            default: break;
+        }
 
         /* Zero by default: */
@@ -117 +122 @@
         AssertReturn(iIndex >= 0 && iIndex < childCount(), 0);
 
-        /* Return the child with the passed iIndex: */
-        return QAccessible::queryAccessibleInterface(item()->items().at(iIndex));
+        /* Return the child with the iIndex: */
+        switch (item()->type())
+        {
+            case UIGDetailsItemType_Set:     return QAccessible::queryAccessibleInterface(item()->items().at(iIndex));
+            case UIGDetailsItemType_Element: return QAccessible::queryAccessibleInterface(&item()->toElement()->text()[iIndex]);
+            default: break;
+        }
+
+        /* Null be default: */
+        return 0;
     }
 
@@ -162 +175 @@
     virtual QAccessible::Role role() const /* override */
     {
-        /* Make sure item still alive: */
-        AssertPtrReturn(item(), QAccessible::NoRole);
-
-        /* Return the role of set: */
-        if (item()->type() == UIGDetailsItemType_Set)
-            return QAccessible::List;
-
-        /* ListItem by default: */
-        return QAccessible::ListItem;
+        /* Return the role: */
+        return QAccessible::List;
     }
 
@@ -176 +182 @@
     virtual QAccessible::State state() const /* override */
     {
-        /* Return the default state: */
-        QAccessible::State state;
-        return state;
+        /* Return the state: */
+        return QAccessible::State();
     }