Changeset 105063 in vbox

Timestamp:

Jun 27, 2024 2:04:43 PM (5 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10681: QITableView: Reworking accessibility interface to support proxy-models.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/extensions

Files:

• QITableView.cpp (modified) (5 diffs)
• QITableView.h (modified) (1 diff)

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

@@ -28 +28 @@
 /* Qt includes: */
 #include <QAccessibleWidget>
+#include <QSortFilterProxyModel>
 
 /* GUI includes: */
@@ -260 +261 @@
 }
 
-QAccessibleInterface *QIAccessibilityInterfaceForQITableViewRow::child(int iIndex) const /* override */
+QAccessibleInterface *QIAccessibilityInterfaceForQITableViewRow::child(int iIndex) const
 {
     /* Make sure row still alive: */
@@ -271 +272 @@
 }
 
-int QIAccessibilityInterfaceForQITableViewRow::indexOfChild(const QAccessibleInterface *pChild) const /* override */
+int QIAccessibilityInterfaceForQITableViewRow::indexOfChild(const QAccessibleInterface *pChild) const
 {
     /* Search for corresponding child: */
@@ -345 +346 @@
     /* Make sure table still alive: */
     AssertPtrReturn(table(), 0);
+    /* Make sure model still alive: */
+    AssertPtrReturn(table()->model(), 0);
 
     /* Return the number of children: */
-    return table()->childCount();
+    return table()->model()->rowCount();
 }
 
@@ -353 +356 @@
 {
     /* Make sure table still alive: */
-    AssertPtrReturn(table(), 0);
+    QITableView *pTable = table();
+    AssertPtrReturn(pTable, 0);
+    /* Make sure model still alive: */
+    QAbstractItemModel *pModel = pTable->model();
+    AssertPtrReturn(pModel, 0);
     /* Make sure index is valid: */
     AssertReturn(iIndex >= 0, 0);
-    if (iIndex >= childCount())
-    {
-        // WORKAROUND:
-        // Normally I would assert here, but Qt5 accessibility code has
-        // a hard-coded architecture for a table-views which we do not like
-        // but have to live with and this architecture enumerates cells
-        // including header column and row, so Qt5 can try to address
-        // our interface with index which surely out of bounds by our laws.
-        // So let's assume that's exactly such case and try to enumerate
-        // table cells including header column and row.
-        // printf("Invalid index: %d\n", iIndex);
-
+
+    /* Real index might be different: */
+    int iRealRowIndex = iIndex;
+
+    // WORKAROUND:
+    // For a table-views Qt accessibility code has a hard-coded architecture which we do not like
+    // but have to live with, this architecture enumerates cells including header column and row,
+    // so Qt can try to address our interface with index which surely out of bounds by our laws.
+    // Let's assume that's exactly the case and try to enumerate cells including header column and row.
+    if (iRealRowIndex >= childCount())
+    {
         // Split delimeter is overall column count, including vertical header:
-        const int iColumnCount = table()->model()->columnCount() + 1 /* v_header */;
+        const int iColumnCount = pModel->columnCount() + 1 /* v_header */;
         // Real index is zero-based, incoming is 1-based:
         const int iRealIndex = iIndex - 1;
         // Real row index, excluding horizontal header:
-        const int iRealRowIndex = iRealIndex / iColumnCount - 1 /* h_header */;
-        // printf("Actual row index: %d\n", iRealRowIndex);
-
-        // Return what we found:
-        return iRealRowIndex >= 0 && iRealRowIndex < childCount() ?
-               QAccessible::queryAccessibleInterface(table()->childItem(iRealRowIndex)) : 0;
-    }
-
-    /* Return the child with the passed iIndex: */
-    return QAccessible::queryAccessibleInterface(table()->childItem(iIndex));
+        iRealRowIndex = iRealIndex / iColumnCount - 1 /* h_header */;
+        // printf("Invalid index: %d, Actual index: %d\n", iIndex, iRealRowIndex);
+    }
+
+    /* Make sure index fits the bounds finally: */
+    if (iRealRowIndex >= childCount())
+        return 0;
+
+    /* Acquire child-index: */
+    const QModelIndex childIndex = pModel->index(iRealRowIndex, 0);
+    /* Check whether we have proxy model set or source one otherwise: */
+    const QSortFilterProxyModel *pProxyModel = qobject_cast<const QSortFilterProxyModel*>(pModel);
+    /* Acquire source-model child-index (can be the same as original if there is no proxy model): */
+    const QModelIndex sourceChildIndex = pProxyModel ? pProxyModel->mapToSource(childIndex) : childIndex;
+
+    /* Acquire row item: */
+    QITableViewRow *pRow = static_cast<QITableViewRow*>(sourceChildIndex.internalPointer());
+    /* Return row's accessibility interface: */
+    return QAccessible::queryAccessibleInterface(pRow);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITableView.h

@@ -117 +117 @@
     virtual ~QITableView() RT_OVERRIDE;
 
-    /** Returns the number of children. */
-    virtual int childCount() const { return 0; }
-    /** Returns the child item with @a iIndex. */
-    virtual QITableViewRow *childItem(int /* iIndex */) const { return 0; }
-
     /** Makes sure current editor data committed. */
     void makeSureEditorDataCommitted();