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

equal deleted inserted replaced

-:93b982ccede2
+:5daf16870df6
 QModelIndex topLeft = d->model->index(row, tl.column(), d->root);
 QModelIndex bottomRight = d->model->index(row, br.column(), d->root);
 selection.append(QItemSelectionRange(topLeft, bottomRight));
 }
 } else { // nothing moved
-selection.append(QItemSelectionRange(tl, br));
+QItemSelectionRange range(tl, br);
+if (!range.isEmpty())
+selection.append(range);
 }
 d->selectionModel->select(selection, command);
 }
 /*!
 \internal
 Returns the rectangle from the viewport of the items in the given
 \a selection.
+Since 4.7, the returned region only contains rectangles intersecting
+(or included in) the viewport.
 */
 QRegion QTableView::visualRegionForSelection(const QItemSelection &selection) const
 {
 Q_D(const QTableView);
 if (selection.isEmpty())
 return QRegion();
 QRegion selectionRegion;
+const QRect &viewportRect = d->viewport->rect();
 bool verticalMoved = verticalHeader()->sectionsMoved();
 bool horizontalMoved = horizontalHeader()->sectionsMoved();
 if ((verticalMoved && horizontalMoved) || (d->hasSpans() && (verticalMoved || horizontalMoved))) {
 for (int i = 0; i < selection.count(); ++i) {
 QItemSelectionRange range = selection.at(i);
 if (range.parent() != d->root || !range.isValid())
 continue;
 for (int r = range.top(); r <= range.bottom(); ++r)
-for (int c = range.left(); c <= range.right(); ++c)
+for (int c = range.left(); c <= range.right(); ++c) {
-selectionRegion += QRegion(visualRect(d->model->index(r, c, d->root)));
+const QRect &rangeRect = visualRect(d->model->index(r, c, d->root));
+if (viewportRect.intersects(rangeRect))
+selectionRegion += rangeRect;
+}
 }
 } else if (horizontalMoved) {
 for (int i = 0; i < selection.count(); ++i) {
 QItemSelectionRange range = selection.at(i);
 if (range.parent() != d->root || !range.isValid())
 int top = rowViewportPosition(range.top());
 int bottom = rowViewportPosition(range.bottom()) + rowHeight(range.bottom());
 if (top > bottom)
 qSwap<int>(top, bottom);
 int height = bottom - top;
-for (int c = range.left(); c <= range.right(); ++c)
+for (int c = range.left(); c <= range.right(); ++c) {
-selectionRegion += QRegion(QRect(columnViewportPosition(c), top,
+const QRect rangeRect(columnViewportPosition(c), top, columnWidth(c), height);
-columnWidth(c), height));
+if (viewportRect.intersects(rangeRect))
+selectionRegion += rangeRect;
+}
 }
 } else if (verticalMoved) {
 for (int i = 0; i < selection.count(); ++i) {
 QItemSelectionRange range = selection.at(i);
 if (range.parent() != d->root || !range.isValid())
 int left = columnViewportPosition(range.left());
 int right = columnViewportPosition(range.right()) + columnWidth(range.right());
 if (left > right)
 qSwap<int>(left, right);
 int width = right - left;
-for (int r = range.top(); r <= range.bottom(); ++r)
+for (int r = range.top(); r <= range.bottom(); ++r) {
-selectionRegion += QRegion(QRect(left, rowViewportPosition(r),
+const QRect rangeRect(left, rowViewportPosition(r), width, rowHeight(r));
-width, rowHeight(r)));
+if (viewportRect.intersects(rangeRect))
+selectionRegion += rangeRect;
+}
 }
 } else { // nothing moved
 const int gridAdjust = showGrid() ? 1 : 0;
 for (int i = 0; i < selection.count(); ++i) {
 QItemSelectionRange range = selection.at(i);
 rright = columnViewportPosition(range.right()) + columnWidth(range.right());
 } else {
 rleft = columnViewportPosition(range.right());
 rright = columnViewportPosition(range.left()) + columnWidth(range.left());
 }
-selectionRegion += QRect(QPoint(rleft, rtop), QPoint(rright - 1 - gridAdjust, rbottom - 1 - gridAdjust));
+const QRect rangeRect(QPoint(rleft, rtop), QPoint(rright - 1 - gridAdjust, rbottom - 1 - gridAdjust));
+if (viewportRect.intersects(rangeRect))
+selectionRegion += rangeRect;
 if (d->hasSpans()) {
 foreach (QSpanCollection::Span *s,
 d->spans.spansInRect(range.left(), range.top(), range.width(), range.height())) {
-if (range.contains(s->top(), s->left(), range.parent()))
+if (range.contains(s->top(), s->left(), range.parent())) {
-selectionRegion += d->visualSpanRect(*s);
+const QRect &visualSpanRect = d->visualSpanRect(*s);
+if (viewportRect.intersects(visualSpanRect))
+selectionRegion += visualSpanRect;
+}
 }
 }
 }
 }
 number of rows is specified by \a newCount.
 */
 void QTableView::rowCountChanged(int /*oldCount*/, int /*newCount*/ )
 {
 Q_D(QTableView);
-updateGeometries();
+d->doDelayedItemsLayout();
-if (verticalScrollMode() == QAbstractItemView::ScrollPerItem)
-d->verticalHeader->setOffsetToSectionPosition(verticalScrollBar()->value());
-else
-d->verticalHeader->setOffset(verticalScrollBar()->value());
-d->viewport->update();
 }
 /*!
 This slot is called whenever columns are added or deleted. The
 previous number of columns is specified by \a oldCount, and the new
 if (!model())
 return -1;
 ensurePolished();
-int left = qMax(0, columnAt(0));
+int left = qMax(0, d->horizontalHeader->visualIndexAt(0));
-int right = columnAt(d->viewport->width());
+int right = d->horizontalHeader->visualIndexAt(d->viewport->width());
 if (right == -1) // the table don't have enough columns to fill the viewport
 right = d->model->columnCount(d->root) - 1;
 QStyleOptionViewItemV4 option = d->viewOptionsV4();
 if (!model())
 return -1;
 ensurePolished();
-int top = qMax(0, rowAt(0));
+int top = qMax(0, d->verticalHeader->visualIndexAt(0));
-int bottom = rowAt(d->viewport->height());
+int bottom = d->verticalHeader->visualIndexAt(d->viewport->height());
 if (!isVisible() || bottom == -1) // the table don't have enough rows to fill the viewport
 bottom = d->model->rowCount(d->root) - 1;
 QStyleOptionViewItemV4 option = d->viewOptionsV4();

branch	GCC_SURGE
changeset 31	5daf16870df6
parent 30	5dc02b23752f