FCL/sf/mw/qt: comparison src/gui/itemviews/qtreeview.cpp

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 void QTreeView::setModel(QAbstractItemModel *model)
 {
 Q_D(QTreeView);
 if (model == d->model)
 return;
+if (d->model && d->model != QAbstractItemModelPrivate::staticEmptyModel()) {
+disconnect(d->model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+this, SLOT(rowsRemoved(QModelIndex,int,int)));
+disconnect(d->model, SIGNAL(modelAboutToBeReset()), this, SLOT(_q_modelAboutToBeReset()));
+}
 if (d->selectionModel) { // support row editing
 disconnect(d->selectionModel, SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
 d->model, SLOT(submit()));
 disconnect(d->model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
 this, SLOT(rowsRemoved(QModelIndex,int,int)));
 if (enable) {
 //sortByColumn has to be called before we connect or set the sortingEnabled flag
 // because otherwise it will not call sort on the model.
 sortByColumn(header()->sortIndicatorSection(), header()->sortIndicatorOrder());
 connect(header(), SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)),
-this, SLOT(_q_sortIndicatorChanged(int, Qt::SortOrder)), Qt::UniqueConnection);
+this, SLOT(_q_sortIndicatorChanged(int,Qt::SortOrder)), Qt::UniqueConnection);
 } else {
 disconnect(header(), SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)),
-this, SLOT(_q_sortIndicatorChanged(int, Qt::SortOrder)));
+this, SLOT(_q_sortIndicatorChanged(int,Qt::SortOrder)));
 }
 d->sortingEnabled = enable;
 }
 bool QTreeView::isSortingEnabled() const
 QModelIndex oldIndex = d->modelIndex(oldBranch),
 newIndex = d->modelIndex(d->hoverBranch);
 if (oldIndex != newIndex) {
 QRect oldRect = visualRect(oldIndex);
 QRect newRect = visualRect(newIndex);
-viewport()->update(oldRect.left() - d->indent, oldRect.top(), d->indent, oldRect.height());
+oldRect.setLeft(oldRect.left() - d->indent);
-viewport()->update(newRect.left() - d->indent, newRect.top(), d->indent, newRect.height());
+newRect.setLeft(newRect.left() - d->indent);
+//we need to paint the whole items (including the decoration) so that when the user
+//moves the mouse over those elements they are updated
+viewport()->update(oldRect);
+viewport()->update(newRect);
 }
 }
 if (selectionBehavior() == QAbstractItemView::SelectRows) {
 QModelIndex newHoverIndex = indexAt(he->pos());
 if (d->hover != newHoverIndex) {
 // paint the visible rows
 for (; i < viewItems.count() && y <= area.bottom(); ++i) {
 const int itemHeight = d->itemHeight(i);
 option.rect.setRect(0, y, viewportWidth, itemHeight);
-option.state = state | (viewItems.at(i).expanded
+option.state = state | (viewItems.at(i).expanded ? QStyle::State_Open : QStyle::State_None)
-? QStyle::State_Open : QStyle::State_None);
+| (viewItems.at(i).hasChildren ? QStyle::State_Children : QStyle::State_None)
+| (viewItems.at(i).hasMoreSiblings ? QStyle::State_Sibling : QStyle::State_None);
 d->current = i;
 d->spanning = viewItems.at(i).spanning;
 if (!multipleRects || !drawn.contains(i)) {
 drawRow(painter, option, viewItems.at(i).index);
 if (multipleRects)   // even if the rect only intersects the item,
 // start with the innermost branch
 primitive.moveLeft(reverse ? primitive.left() : primitive.left() - indent);
 opt.rect = primitive;
 const bool expanded = viewItem.expanded;
-const bool children = (((expanded && viewItem.total > 0)) // already laid out and has children
+const bool children = viewItem.hasChildren;
-|| d->hasVisibleChildren(index)); // not laid out yet, so we don't know
+bool moreSiblings = viewItem.hasMoreSiblings;
-bool moreSiblings = false;
-if (d->hiddenIndexes.isEmpty())
-moreSiblings = (d->model->rowCount(parent) - 1 > index.row());
-else
-moreSiblings = ((d->viewItems.size() > item +1)
-&& (d->viewItems.at(item + 1).index.parent() == parent));
 opt.state = QStyle::State_Item | extraFlags
 | (moreSiblings ? QStyle::State_Sibling : QStyle::State_None)
 | (children ? QStyle::State_Children : QStyle::State_None)
 | (expanded ? QStyle::State_Open : QStyle::State_None);
 i = d->itemAtCoordinate(event->y());
 if (i == -1)
 return; // user clicked outside the items
 const QPersistentModelIndex firstColumnIndex = d->viewItems.at(i).index;
+const QPersistentModelIndex persistent = indexAt(event->pos());
-int column = d->header->logicalIndexAt(event->x());
-QPersistentModelIndex persistent = firstColumnIndex.sibling(firstColumnIndex.row(), column);
 if (d->pressedIndex != persistent) {
 mousePressEvent(event);
 return;
 }
 }
 #endif
 if (vi < 0)
 vi = qMax(0, d->viewIndex(current));
+if (isRightToLeft()) {
+if (cursorAction == MoveRight)
+cursorAction = MoveLeft;
+else if (cursorAction == MoveLeft)
+cursorAction = MoveRight;
+}
 switch (cursorAction) {
 case MoveNext:
 case MoveDown:
 #ifdef QT_KEYPAD_NAVIGATION
 if (vi == d->viewItems.count()-1 && QApplication::keypadNavigationEnabled())
 if (parent.column() != 0 && parent.isValid()) {
 QAbstractItemView::rowsInserted(parent, start, end);
 return;
 }
-if (parent != d->root && !d->isIndexExpanded(parent) && d->model->rowCount(parent) > (end - start) + 1) {
+const int parentRowCount = d->model->rowCount(parent);
+const int delta = end - start + 1;
+if (parent != d->root && !d->isIndexExpanded(parent) && parentRowCount > delta) {
 QAbstractItemView::rowsInserted(parent, start, end);
 return;
 }
 const int parentItem = d->viewIndex(parent);
 const int firstChildItem = parentItem + 1;
 const int lastChildItem = firstChildItem + ((parentItem == -1)
 ? d->viewItems.count()
 : d->viewItems.at(parentItem).total) - 1;
-const int delta = end - start + 1;
+if (parentRowCount == end + 1 && start > 0) {
+//need to Update hasMoreSiblings
+int previousRow = start - 1;
+QModelIndex previousSibilingModelIndex = d->model->index(previousRow, 0, parent);
+bool isHidden = d->isRowHidden(previousSibilingModelIndex);
+while (isHidden && previousRow > 0) {
+previousRow--;
+previousSibilingModelIndex = d->model->index(previousRow, 0, parent);
+isHidden = d->isRowHidden(previousSibilingModelIndex);
+}
+if (!isHidden) {
+const int previousSibilling = d->viewIndex(previousSibilingModelIndex);
+if(previousSibilling != -1)
+d->viewItems[previousSibilling].hasMoreSiblings = true;
+}
+}
 QVector<QTreeViewItem> insertedItems(delta);
 for (int i = 0; i < delta; ++i) {
 insertedItems[i].index = d->model->index(i + start, 0, parent);
 insertedItems[i].level = childLevel;
+insertedItems[i].hasChildren = d->hasVisibleChildren(insertedItems[i].index);
+insertedItems[i].hasMoreSiblings = !((i == delta - 1) && (parentRowCount == end +1));
 }
 if (d->viewItems.isEmpty())
 d->defaultItemHeight = indexRowSizeHint(insertedItems[0].index);
 int insertPos;
 if (delta > 1) {
 qCopy(insertedItems.begin() + 1, insertedItems.end(),
 d->viewItems.begin() + insertPos + 1);
 }
+if (parentItem != -1)
+d->viewItems[parentItem].hasChildren = true;
 d->updateChildCount(parentItem, delta);
 updateGeometries();
 viewport()->update();
 } else if ((parentItem != -1) && d->viewItems.at(parentItem).expanded) {
 d->doDelayedItemsLayout();
 } else if (parentItem != -1 && (d->model->rowCount(parent) == end - start + 1)) {
-// the parent just went from 0 children to having some update to re-paint the decoration
+// the parent just went from 0 children to more. update to re-paint the decoration
+d->viewItems[parentItem].hasChildren = true;
 viewport()->update();
 }
 QAbstractItemView::rowsInserted(parent, start, end);
 }
 {
 Q_D(const QTreeView);
 d->executePostedLayout();
 if (d->viewItems.isEmpty())
 return -1;
+ensurePolished();
 int w = 0;
 QStyleOptionViewItemV4 option = d->viewOptionsV4();
 const QVector<QTreeViewItem> viewItems = d->viewItems;
 int start = 0;
 int first = i + 1;
 int level = (i >= 0 ? viewItems.at(i).level + 1 : 0);
 int hidden = 0;
 int last = 0;
 int children = 0;
+QTreeViewItem *item = 0;
 for (int j = first; j < first + count; ++j) {
 current = model->index(j - first, 0, parent);
 if (isRowHidden(current)) {
 ++hidden;
 last = j - hidden + children;
 } else {
 last = j - hidden + children;
-viewItems[last].index = current;
+if (item)
-viewItems[last].level = level;
+item->hasMoreSiblings = true;
-viewItems[last].height = 0;
+item = &viewItems[last];
-viewItems[last].spanning = q->isFirstColumnSpanned(current.row(), parent);
+item->index = current;
-viewItems[last].expanded = false;
+item->level = level;
-viewItems[last].total = 0;
+item->height = 0;
+item->spanning = q->isFirstColumnSpanned(current.row(), parent);
+item->expanded = false;
+item->total = 0;
+item->hasMoreSiblings = false;
 if (isIndexExpanded(current)) {
-viewItems[last].expanded = true;
+item->expanded = true;
 layout(last);
-children += viewItems[last].total;
+item = &viewItems[last];
+children += item->total;
+item->hasChildren = item->total > 0;
 last = j - hidden + children;
+} else {
+item->hasChildren = hasVisibleChildren(current);
 }
 }
 }
 // remove hidden items
 ? viewItems.count()
 : viewItems.at(parentItem).total) - 1;
 const int delta = end - start + 1;
+int previousSibiling = -1;
 int removedCount = 0;
 for (int item = firstChildItem; item <= lastChildItem; ) {
 Q_ASSERT(viewItems.at(item).level == childLevel);
 const QModelIndex modelIndex = viewItems.at(item).index;
 //Q_ASSERT(modelIndex.parent() == parent);
 const int count = viewItems.at(item).total + 1;
 if (modelIndex.row() < start) {
+previousSibiling = item;
 // not affected by the removal
 item += count;
 } else if (modelIndex.row() <= end) {
 // removed
 viewItems.remove(item, count);
 }
 item += count;
 }
 }
+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 (after) {
 q->updateGeometries();
 viewport->update();
 } else {
 //we have removed items: we should at least update the scroll bar values.

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7
child 7	f7bc934e204c
child 18	2f34d5167611