Changeset 64774 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Dec 1, 2016 3:34:45 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 144): Improving QITreeViewItem model-index calculation algorithm by taking sort-filter-proxy models into account.

File:

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

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

@@ -321 +321 @@
 QModelIndex QITreeViewItem::modelIndex() const
 {
+    /* Check whether we have proxy model set or source one otherwise: */
+    QSortFilterProxyModel *pProxyModel = qobject_cast<QSortFilterProxyModel*>(parentTree()->model());
+
+    /* Determine proxy and source root model-indexes, they can be equal: */
+    const QModelIndex rootInProxy = parentTree()->rootIndex();
+    const QModelIndex rootInSource = pProxyModel ? pProxyModel->mapToSource(rootInProxy) : rootInProxy;
+
     /* Make sure it's not root model-index: */
-    if (   parentTree()->rootIndex().internalPointer()
-        && parentTree()->rootIndex().internalPointer() == this)
-        return parentTree()->rootIndex();
+    if (   rootInSource.internalPointer()
+        && rootInSource.internalPointer() == this)
+        return rootInProxy;
 
     /* Determine our index inside parent: */
@@ -350 +357 @@
 
     /* Get parent model-index: */
-    QModelIndex parentModelIndex = parentItem() ? parentItem()->modelIndex() : parentTree()->rootIndex();
+    QModelIndex parentModelIndex = parentItem() ? parentItem()->modelIndex() : rootInProxy;
 
     /* Return model-index as child of parent model-index: */