MCL/sf/mw/qt: comparison src/gui/itemviews/qabstractitemview.cpp

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 QAbstractItemViewPrivate::QAbstractItemViewPrivate()
 :   model(QAbstractItemModelPrivate::staticEmptyModel()),
 itemDelegate(0),
 selectionModel(0),
 ctrlDragSelectionFlag(QItemSelectionModel::NoUpdate),
+noSelectionOnMousePress(false),
 selectionMode(QAbstractItemView::ExtendedSelection),
 selectionBehavior(QAbstractItemView::SelectItems),
 currentlyCommittingEditor(0),
 pressedModifiers(Qt::NoModifier),
 pressedPosition(QPoint(-1, -1)),
 #endif
 autoScroll(true),
 autoScrollMargin(16),
 autoScrollCount(0),
 shouldScrollToCurrentOnShow(false),
+shouldClearStatusTip(false),
 alternatingColors(false),
 textElideMode(Qt::ElideRight),
 verticalScrollMode(QAbstractItemView::ScrollPerItem),
 horizontalScrollMode(QAbstractItemView::ScrollPerItem),
 currentIndexSet(false),
 #ifdef QT_SOFTKEYS_ENABLED
 doneSoftKey = QSoftKeyManager::createKeyedAction(QSoftKeyManager::DoneSoftKey, Qt::Key_Back, q);
 #endif
 }
+void QAbstractItemViewPrivate::setHoverIndex(const QPersistentModelIndex &index)
+{
+Q_Q(QAbstractItemView);
+if (hover == index)
+return;
+q->update(hover); //update the old one
+hover = index;
+q->update(hover); //update the new one
+}
 void QAbstractItemViewPrivate::checkMouseMove(const QPersistentModelIndex &index)
 {
 //we take a persistent model index because the model might change by emitting signals
 Q_Q(QAbstractItemView);
+setHoverIndex(index);
 if (viewportEnteredNeeded || enteredIndex != index) {
 viewportEnteredNeeded = false;
 if (index.isValid()) {
 emit q->entered(index);
 #ifndef QT_NO_STATUSTIP
 QString statustip = model->data(index, Qt::StatusTipRole).toString();
-if (parent && !statustip.isEmpty()) {
+if (parent && (shouldClearStatusTip || !statustip.isEmpty())) {
 QStatusTipEvent tip(statustip);
 QApplication::sendEvent(parent, &tip);
+shouldClearStatusTip = !statustip.isEmpty();
 }
 #endif
 } else {
 #ifndef QT_NO_STATUSTIP
-if (parent) {
+if (parent && shouldClearStatusTip) {
 QString emptyString;
 QStatusTipEvent tip( emptyString );
 QApplication::sendEvent(parent, &tip);
 }
 #endif
 if (d->model && d->model != QAbstractItemModelPrivate::staticEmptyModel()) {
 disconnect(d->model, SIGNAL(destroyed()),
 this, SLOT(_q_modelDestroyed()));
 disconnect(d->model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
 this, SLOT(dataChanged(QModelIndex,QModelIndex)));
+disconnect(d->model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)),
+this, SLOT(_q_headerDataChanged()));
 disconnect(d->model, SIGNAL(rowsInserted(QModelIndex,int,int)),
 this, SLOT(rowsInserted(QModelIndex,int,int)));
 disconnect(d->model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
 this, SLOT(rowsAboutToBeRemoved(QModelIndex,int,int)));
 disconnect(d->model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
 if (d->model != QAbstractItemModelPrivate::staticEmptyModel()) {
 connect(d->model, SIGNAL(destroyed()),
 this, SLOT(_q_modelDestroyed()));
 connect(d->model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
 this, SLOT(dataChanged(QModelIndex,QModelIndex)));
+connect(d->model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)),
+this, SLOT(_q_headerDataChanged()));
 connect(d->model, SIGNAL(rowsInserted(QModelIndex,int,int)),
 this, SLOT(rowsInserted(QModelIndex,int,int)));
 connect(d->model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
 this, SLOT(rowsAboutToBeRemoved(QModelIndex,int,int)));
 connect(d->model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
 */
 bool QAbstractItemView::viewportEvent(QEvent *event)
 {
 Q_D(QAbstractItemView);
 switch (event->type()) {
-case QEvent::HoverEnter: {
+case QEvent::HoverMove:
-QHoverEvent *he = static_cast<QHoverEvent*>(event);
+case QEvent::HoverEnter:
-d->hover = indexAt(he->pos());
+d->setHoverIndex(indexAt(static_cast<QHoverEvent*>(event)->pos()));
-update(d->hover);
+break;
-break; }
+case QEvent::HoverLeave:
-case QEvent::HoverLeave: {
+d->setHoverIndex(QModelIndex());
-update(d->hover); // update old
+break;
-d->hover = QModelIndex();
-break; }
-case QEvent::HoverMove: {
-QHoverEvent *he = static_cast<QHoverEvent*>(event);
-QModelIndex old = d->hover;
-d->hover = indexAt(he->pos());
-if (d->hover != old)
-d->viewport->update(visualRect(old)|visualRect(d->hover));
-break; }
 case QEvent::Enter:
 d->viewportEnteredNeeded = true;
 break;
 case QEvent::Leave:
+#ifndef QT_NO_STATUSTIP
+if (d->shouldClearStatusTip && d->parent) {
+QString empty;
+QStatusTipEvent tip(empty);
+QApplication::sendEvent(d->parent, &tip);
+d->shouldClearStatusTip = false;
+}
+#endif
 d->enteredIndex = QModelIndex();
 break;
 case QEvent::ToolTip:
 case QEvent::QueryWhatsThis:
 case QEvent::WhatsThis: {
 d->pressedAlreadySelected = d->selectionModel->isSelected(index);
 d->pressedIndex = index;
 d->pressedModifiers = event->modifiers();
 QItemSelectionModel::SelectionFlags command = selectionCommand(index, event);
+d->noSelectionOnMousePress = command == QItemSelectionModel::NoUpdate || !index.isValid();
 QPoint offset = d->offset();
 if ((command & QItemSelectionModel::Current) == 0)
 d->pressedPosition = pos + offset;
-else if (!indexAt(d->pressedPosition).isValid())
+else if (!indexAt(d->pressedPosition - offset).isValid())
 d->pressedPosition = visualRect(currentIndex()).center() + offset;
 if (edit(index, NoEditTriggers, event))
 return;
 EditTrigger trigger = (selectedClicked ? SelectedClicked : NoEditTriggers);
 bool edited = edit(index, trigger, event);
 d->ctrlDragSelectionFlag = QItemSelectionModel::NoUpdate;
-//in the case the user presses on no item we might decide to clear the selection
+if (d->selectionModel && d->noSelectionOnMousePress) {
-if (d->selectionModel && !index.isValid())
+d->noSelectionOnMousePress = false;
-d->selectionModel->select(QModelIndex(), selectionCommand(index, event));
+d->selectionModel->select(index, selectionCommand(index, event));
+}
 setState(NoState);
 if (click) {
 emit clicked(index);
 */
 void QAbstractItemView::focusInEvent(QFocusEvent *event)
 {
 Q_D(QAbstractItemView);
 QAbstractScrollArea::focusInEvent(event);
-if (selectionModel()
+const QItemSelectionModel* model = selectionModel();
+const bool currentIndexValid = currentIndex().isValid();
+if (model
 && !d->currentIndexSet
-&& !currentIndex().isValid()) {
+&& !currentIndexValid) {
 bool autoScroll = d->autoScroll;
 d->autoScroll = false;
 QModelIndex index = moveCursor(MoveNext, Qt::NoModifier); // first visible index
 if (index.isValid() && d->isIndexEnabled(index))
 selectionModel()->setCurrentIndex(index, QItemSelectionModel::NoUpdate);
 d->autoScroll = autoScroll;
 }
+if (model && currentIndexValid) {
+if (currentIndex().flags() != Qt::ItemIsEditable)
+setAttribute(Qt::WA_InputMethodEnabled, false);
+else
+setAttribute(Qt::WA_InputMethodEnabled);
+}
+if (!currentIndexValid)
+setAttribute(Qt::WA_InputMethodEnabled, false);
 d->viewport->update();
 }
 /*!
 This function is called with the given \a event when the widget
 if (command != QItemSelectionModel::NoUpdate
 || style()->styleHint(QStyle::SH_ItemView_MovementWithoutUpdatingSelection, 0, this)) {
 // note that we don't check if the new current index is enabled because moveCursor() makes sure it is
 if (command & QItemSelectionModel::Current) {
 d->selectionModel->setCurrentIndex(newCurrent, QItemSelectionModel::NoUpdate);
-if (!indexAt(d->pressedPosition).isValid())
+if (!indexAt(d->pressedPosition - d->offset()).isValid())
 d->pressedPosition = visualRect(oldCurrent).center() + d->offset();
 QRect rect(d->pressedPosition - d->offset(), visualRect(newCurrent).center());
 setSelection(rect, command);
 } else {
 d->selectionModel->setCurrentIndex(newCurrent, command);
 void QAbstractItemView::verticalScrollbarValueChanged(int value)
 {
 Q_D(QAbstractItemView);
 if (verticalScrollBar()->maximum() == value && d->model->canFetchMore(d->root))
 d->model->fetchMore(d->root);
-d->checkMouseMove(viewport()->mapFromGlobal(QCursor::pos()));
+QPoint posInVp = viewport()->mapFromGlobal(QCursor::pos());
+if (viewport()->rect().contains(posInVp))
+d->checkMouseMove(posInVp);
 }
 /*!
 \internal
 */
 void QAbstractItemView::horizontalScrollbarValueChanged(int value)
 {
 Q_D(QAbstractItemView);
 if (horizontalScrollBar()->maximum() == value && d->model->canFetchMore(d->root))
 d->model->fetchMore(d->root);
-d->checkMouseMove(viewport()->mapFromGlobal(QCursor::pos()));
+QPoint posInVp = viewport()->mapFromGlobal(QCursor::pos());
+if (viewport()->rect().contains(posInVp))
+d->checkMouseMove(posInVp);
 }
 /*!
 \internal
 */
 Q_D(const QAbstractItemView);
 if (row < 0 || row >= d->model->rowCount() || !model())
 return -1;
+ensurePolished();
 QStyleOptionViewItemV4 option = d->viewOptionsV4();
 int height = 0;
 int colCount = d->model->columnCount(d->root);
 QModelIndex index;
 for (int c = 0; c < colCount; ++c) {
 {
 Q_D(const QAbstractItemView);
 if (column < 0 || column >= d->model->columnCount() || !model())
 return -1;
+ensurePolished();
 QStyleOptionViewItemV4 option = d->viewOptionsV4();
 int width = 0;
 int rows = d->model->rowCount(d->root);
 QModelIndex index;
 const bool rightButtonPressed = button & Qt::RightButton;
 const bool shiftKeyPressed = modifiers & Qt::ShiftModifier;
 const bool controlKeyPressed = modifiers & Qt::ControlModifier;
 if (((index == pressedIndex && selectionModel->isSelected(index))
 || !index.isValid()) && state != QAbstractItemView::DragSelectingState
-&& !shiftKeyPressed && !controlKeyPressed && !rightButtonPressed)
+&& !shiftKeyPressed && !controlKeyPressed && (!rightButtonPressed || !index.isValid()))
 return QItemSelectionModel::ClearAndSelect|selectionBehaviorFlags();
 return QItemSelectionModel::NoUpdate;
 }
 case QEvent::KeyPress: {
 // NoUpdate on Key movement and Ctrl

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7