From 0c3d59a34c404ba1cec1ab6dbe88e4bf0664538b Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierry.bastian@nokia.com>
Date: Tue, 12 May 2009 16:13:40 +0200
Subject: QListView was assuming that selected indexes were always children of
 their root. This can be different.

...especially if one manages the selection by program or if you share
the selection model with a treeview.

Task-number: 196118
Reviewed-by: ogoffart
---
 src/gui/itemviews/qlistview.cpp        |  8 ++++++--
 tests/auto/qlistview/tst_qlistview.cpp | 24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/gui/itemviews/qlistview.cpp b/src/gui/itemviews/qlistview.cpp
index 3e00cd0..1071c1d 100644
--- a/src/gui/itemviews/qlistview.cpp
+++ b/src/gui/itemviews/qlistview.cpp
@@ -1608,6 +1608,10 @@ QRegion QListView::visualRegionForSelection(const QItemSelection &selection) con
         if (!selection.at(i).isValid())
             continue;
         QModelIndex parent = selection.at(i).topLeft().parent();
+        //we only display the children of the root in a listview
+        //we're not interested in the other model indexes
+        if (parent != d->root)
+            continue;
         int t = selection.at(i).topLeft().row();
         int b = selection.at(i).bottomRight().row();
         if (d->viewMode == IconMode || d->isWrapping()) { // in non-static mode, we have to go through all selected items
@@ -1616,8 +1620,8 @@ QRegion QListView::visualRegionForSelection(const QItemSelection &selection) con
         } else { // in static mode, we can optimize a bit
             while (t <= b && d->isHidden(t)) ++t;
             while (b >= t && d->isHidden(b)) --b;
-            const QModelIndex top = d->model->index(t, c, d->root);
-            const QModelIndex bottom = d->model->index(b, c, d->root);
+            const QModelIndex top = d->model->index(t, c, parent);
+            const QModelIndex bottom = d->model->index(b, c, parent);
             QRect rect(visualRect(top).topLeft(),
                        visualRect(bottom).bottomRight());
             selectionRegion += QRegion(rect);
diff --git a/tests/auto/qlistview/tst_qlistview.cpp b/tests/auto/qlistview/tst_qlistview.cpp
index 791a472..f70db14 100644
--- a/tests/auto/qlistview/tst_qlistview.cpp
+++ b/tests/auto/qlistview/tst_qlistview.cpp
@@ -106,6 +106,7 @@ private slots:
     void task228566_infiniteRelayout();
     void task248430_crashWith0SizedItem();
     void task250446_scrollChanged();
+    void task196118_visualRegionForSelection();
     void keyboardSearch();
 };
 
@@ -1556,6 +1557,29 @@ void tst_QListView::task250446_scrollChanged()
     QCOMPARE(view.currentIndex(), index);
 }
 
+void tst_QListView::task196118_visualRegionForSelection()
+{
+    class MyListView : public QListView
+    {
+    public:
+        QRegion visualRegionForSelection() const
+        { return QListView::visualRegionForSelection( selectionModel()->selection()); }
+    } view;
+
+    QStandardItemModel model;
+    QStandardItem top1("top1");
+    QStandardItem sub1("sub1");
+    top1.appendRow(QList<QStandardItem*>() << &sub1);
+    model.appendColumn(QList<QStandardItem*>() << &top1);
+    view.setModel(&model);
+    view.setRootIndex(top1.index());
+
+    view.selectionModel()->select(top1.index(), QItemSelectionModel::Select);
+
+    QCOMPARE(view.selectionModel()->selectedIndexes().count(), 1);
+    QVERIFY(view.visualRegionForSelection().isEmpty());
+}
+
 void tst_QListView::keyboardSearch()
 {
     QStringList items;
-- 
cgit v0.12