Changeset 64742 in vbox for trunk/src/VBox

Timestamp:

Nov 24, 2016 4:10:53 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 136): Improving w/a for QITreeView by taking sort-filter-proxy models into account.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITreeView.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITreeView.cpp

@@ -24 +24 @@
 # include <QMouseEvent>
 # include <QPainter>
+# include <QSortFilterProxyModel>
 
 /* GUI includes: */
@@ -244 +245 @@
         // printf("Invalid index: %d\n", iIndex);
 
+        // Make sure model is alive:
+        AssertPtrReturn(tree()->model(), 0);
+
         // Take into account we also have header with 'column count' indexes,
         // so we should start enumerating tree indexes since 'column count'.
@@ -249 +253 @@
         int iCurrentIndex = iColumnCount;
 
+        // Check whether we have proxy model set or usual one otherwise:
+        QSortFilterProxyModel *pProxyModel = qobject_cast<QSortFilterProxyModel*>(tree()->model());
+
         // Set iterator to root-index initially:
-        const QModelIndex root = tree()->rootIndex();
+        const QModelIndex root = pProxyModel ? pProxyModel->mapToSource(tree()->rootIndex()) :
+                                 tree()->rootIndex();
         QModelIndex index = root;
 
@@ -262 +270 @@
             ++iCurrentIndex;
             if (iCurrentIndex % iColumnCount == 0)
-                index = tree()->indexBelow(index);
+            {
+                index = pProxyModel ? pProxyModel->mapToSource(tree()->indexBelow(pProxyModel->mapFromSource(index))) :
+                                      tree()->indexBelow(index);
+            }
         }