diff options
| author | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2010-02-24 15:55:15 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-02 14:40:20 (GMT) |
| commit | 120905fbc48ac7658fac392113bf45e00880c456 (patch) | |
| tree | e336d91b300cd8faa6162132ea4eef8273831717 /src | |
| parent | d6aba8dd917e8306799743dd33905f2037e00d10 (diff) | |
| download | Qt-120905fbc48ac7658fac392113bf45e00880c456.zip Qt-120905fbc48ac7658fac392113bf45e00880c456.tar.gz Qt-120905fbc48ac7658fac392113bf45e00880c456.tar.bz2 | |
Expand indicator would not be displayed after removal of a collapsed item's child
While setting the hasChildren property of QTreeViewItem, "collapsed" and
"not visible" were being mistaken.
Auto-test included.
Reviewed-by: Olivier
Task-number: QTBUG-7443
(cherry picked from commit 77670c3c0fdc3021356e212e94042a0b5a4f4f8c)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/itemviews/qtreeview.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp index 706d2a8..37168eb 100644 --- a/src/gui/itemviews/qtreeview.cpp +++ b/src/gui/itemviews/qtreeview.cpp @@ -3770,10 +3770,15 @@ void QTreeViewPrivate::rowsRemoved(const QModelIndex &parent, if (previousSibiling != -1 && after && model->rowCount(parent) == start) viewItems[previousSibiling].hasMoreSiblings = false; - - updateChildCount(parentItem, -removedCount); - if (parentItem != -1 && viewItems.at(parentItem).total == 0) - viewItems[parentItem].hasChildren = false; //every children have been removed; + if (parentItem != -1) { + if (viewItems.at(parentItem).expanded) { + updateChildCount(parentItem, -removedCount); + if (viewItems.at(parentItem).total == 0) + viewItems[parentItem].hasChildren = false; //every children have been removed; + } else if (viewItems[parentItem].hasChildren && !hasVisibleChildren(parent)) { + viewItems[parentItem].hasChildren = false; + } + } if (after) { q->updateGeometries(); viewport->update(); |