From 8f6b8c5a9750d49e6b93804d37aa64140460bfa6 Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Mon, 22 Mar 2010 16:58:23 +0100 Subject: Fix a problem with the selection losing items when layout is changed Task-number: QTBUG-2804 Reviewed-by: ogoffart --- src/gui/itemviews/qitemselectionmodel.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gui/itemviews/qitemselectionmodel.cpp b/src/gui/itemviews/qitemselectionmodel.cpp index d066a96..d6e68f6 100644 --- a/src/gui/itemviews/qitemselectionmodel.cpp +++ b/src/gui/itemviews/qitemselectionmodel.cpp @@ -814,6 +814,10 @@ static QItemSelection mergeIndexes(const QList &indexes) while (++i < colSpans.count()) { QModelIndex nextTl = colSpans.at(i).topLeft(); QModelIndex nextBr = colSpans.at(i).bottomRight(); + + if (nextTl.parent() != tl.parent()) + break; // we can't merge selection ranges from different parents + if ((nextTl.column() == prevTl.column()) && (nextBr.column() == br.column()) && (nextTl.row() == prevTl.row() + 1) && (nextBr.row() == br.row() + 1)) { br = nextBr; -- cgit v0.12