Changeset 81683 in vbox

Timestamp:

Nov 5, 2019 7:09:02 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9601: Since we are filtering UIFormEditorView, it is actually using UIFormEditorProxyModel, not UIFormEditorModel as was designed before, so implementing corresponding proxy mapping for accessibility interface stuff is required.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFormEditorWidget.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFormEditorWidget.cpp

@@ -483 +483 @@
     /** Constructs the Form Editor proxy-model passing @a pParent to the base-class. */
     UIFormEditorProxyModel(QObject *pParent = 0);
+
+    /** Returns the number of children. */
+    int childCount() const;
+    /** Returns the child item with @a iIndex. */
+    QITableViewRow *childItem(int iIndex) const;
 
 protected:
@@ -1350 +1355 @@
 }
 
+int UIFormEditorProxyModel::childCount() const
+{
+    return rowCount();
+}
+
+QITableViewRow *UIFormEditorProxyModel::childItem(int iIndex) const
+{
+    /* Make sure iIndex within the bounds: */
+    AssertReturn(iIndex >= 0 && iIndex < rowCount(), 0);
+    /* Acquire actual index of source model: */
+    const QModelIndex i = sourceModel()->index(iIndex, 0);
+    AssertReturn(i.isValid(), 0);
+    /* Get packed item pointer: */
+    UIFormEditorRow *pItem = static_cast<UIFormEditorRow*>(i.internalPointer());
+    AssertReturn(pItem, 0);
+    return pItem;
+}
+
 bool UIFormEditorProxyModel::filterAcceptsRow(int iSourceRow, const QModelIndex &sourceParent) const
 {
@@ -1380 +1403 @@
     /* Redirect request to model: */
     AssertPtrReturn(model(), 0);
-    return qobject_cast<UIFormEditorModel*>(model())->childCount();
+    return qobject_cast<UIFormEditorProxyModel*>(model())->childCount();
 }
 
@@ -1387 +1410 @@
     /* Redirect request to model: */
     AssertPtrReturn(model(), 0);
-    return qobject_cast<UIFormEditorModel*>(model())->childItem(iIndex);
+    return qobject_cast<UIFormEditorProxyModel*>(model())->childItem(iIndex);
 }