From cdbd3c412c62a942aa19823420ffd58de99083b1 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 25 Jun 2014 16:22:24 +0200 Subject: Use QDropEvent::acceptProposedAction() in drop handlers of QAbstractItemView. Fix updating of the drop cursor when the user presses/releases the shift key while dragging. Task-number: QTBUG-39822 Change-Id: I1d9d3a80d349f7e405db24f8f7dc372428c34f52 Reviewed-by: David Faure --- src/widgets/itemviews/qabstractitemview.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index 342fdac636..4b59e72545 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtWidgets module of the Qt Toolkit. @@ -1949,7 +1949,7 @@ void QAbstractItemView::dragMoveEvent(QDragMoveEvent *event) case AboveItem: if (d->isIndexDropEnabled(index.parent())) { d->dropIndicatorRect = QRect(rect.left(), rect.top(), rect.width(), 0); - event->accept(); + event->acceptProposedAction(); } else { d->dropIndicatorRect = QRect(); } @@ -1957,7 +1957,7 @@ void QAbstractItemView::dragMoveEvent(QDragMoveEvent *event) case BelowItem: if (d->isIndexDropEnabled(index.parent())) { d->dropIndicatorRect = QRect(rect.left(), rect.bottom(), rect.width(), 0); - event->accept(); + event->acceptProposedAction(); } else { d->dropIndicatorRect = QRect(); } @@ -1965,7 +1965,7 @@ void QAbstractItemView::dragMoveEvent(QDragMoveEvent *event) case OnItem: if (d->isIndexDropEnabled(index)) { d->dropIndicatorRect = rect; - event->accept(); + event->acceptProposedAction(); } else { d->dropIndicatorRect = QRect(); } @@ -1973,7 +1973,7 @@ void QAbstractItemView::dragMoveEvent(QDragMoveEvent *event) case OnViewport: d->dropIndicatorRect = QRect(); if (d->isIndexDropEnabled(rootIndex())) { - event->accept(); // allow dropping in empty areas + event->acceptProposedAction(); // allow dropping in empty areas } break; } @@ -1981,7 +1981,7 @@ void QAbstractItemView::dragMoveEvent(QDragMoveEvent *event) d->dropIndicatorRect = QRect(); d->dropIndicatorPosition = OnViewport; if (d->isIndexDropEnabled(rootIndex())) { - event->accept(); // allow dropping in empty areas + event->acceptProposedAction(); // allow dropping in empty areas } } d->viewport->update(); @@ -2050,11 +2050,14 @@ void QAbstractItemView::dropEvent(QDropEvent *event) int col = -1; int row = -1; if (d->dropOn(event, &row, &col, &index)) { - if (d->model->dropMimeData(event->mimeData(), - dragDropMode() == InternalMove ? Qt::MoveAction : event->dropAction(), row, col, index)) { - if (dragDropMode() == InternalMove) - event->setDropAction(Qt::MoveAction); + const Qt::DropAction action = dragDropMode() == InternalMove ? Qt::MoveAction : event->dropAction(); + if (d->model->dropMimeData(event->mimeData(), action, row, col, index)) { + if (action != event->dropAction()) { + event->setDropAction(action); event->accept(); + } else { + event->acceptProposedAction(); + } } } stopAutoScroll(); -- cgit v1.2.3