AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use QDropEvent::acceptProposedAction() in drop handlers of QAbstractItemView.

Browse Source 
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 <david.faure@kdab.com>
This commit is contained in:
Friedemann Kleint 2014-06-25 16:22:24 +02:00
parent d812682aa4
commit cdbd3c412c
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/widgets/itemviews/qabstractitemview.cpp
View File

@ -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();