Changeset 104513 in vbox

Timestamp:

May 3, 2024 4:09:10 PM (7 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10681: Accessibility fixes for QITreeView interface; Adjust rectangle to take children into account.

Location:

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

Files:

• QITreeView.cpp (modified) (3 diffs)
• QITreeView.h (modified) (1 diff)

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

@@ -87 +87 @@
     /** Returns corresponding QITreeViewItem. */
     QITreeViewItem *item() const { return qobject_cast<QITreeViewItem*>(object()); }
+
+    /** Returns item bounding rectangle including all the children. */
+    QRect boundingRect() const;
 };
 
@@ -199 +202 @@
 
     /* Get the local rect: */
-    const QRect  itemRectInViewport = item()->rect();
+    const QRect  itemRectInViewport = boundingRect();
     const QSize  itemSize           = itemRectInViewport.size();
     const QPoint itemPosInViewport  = itemRectInViewport.topLeft();
@@ -235 +238 @@
     /* Empty state by default: */
     return QAccessible::State();
+}
+
+QRect QIAccessibilityInterfaceForQITreeViewItem::boundingRect() const
+{
+    /* Calculate cumulative region: */
+    QRegion region;
+    /* Append item rectangle itself: */
+    region += item()->rect();
+    /* Do the same for all the children: */
+    for (int i = 0; i < childCount(); ++i)
+    {
+        QIAccessibilityInterfaceForQITreeViewItem *pChild =
+            dynamic_cast<QIAccessibilityInterfaceForQITreeViewItem*>(child(i));
+        AssertPtrReturn(pChild, QRect());
+        region += pChild->boundingRect();
+    }
+    /* Return cumulative bounding rectangle: */
+    return region.boundingRect();
 }
 

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

@@ -134 +134 @@
     virtual QITreeViewItem *childItem(int /* iIndex */) const { return 0; }
 
-    /** Returns child rectangle. */
-    QRect visualRect(const QModelIndex &index) const RT_OVERRIDE { return QTreeView::visualRect(index); }
-
 protected slots: