diff options
Diffstat (limited to 'src/widgets/itemviews/qabstractitemview.cpp')
| -rw-r--r-- | src/widgets/itemviews/qabstractitemview.cpp | 53 |
1 files changed, 25 insertions, 28 deletions
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index a77448cbc4..3f7a028fa4 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -1,40 +1,32 @@ /**************************************************************************** ** -** 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. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL21$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information ** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -1949,7 +1941,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 +1949,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 +1957,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 +1965,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 +1973,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 +2042,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(); @@ -3126,6 +3121,8 @@ void QAbstractItemView::setIndexWidget(const QModelIndex &index, QWidget *widget Q_D(QAbstractItemView); if (!d->isIndexValid(index)) return; + if (indexWidget(index) == widget) + return; if (QWidget *oldWidget = indexWidget(index)) { d->persistent.remove(oldWidget); d->removeEditor(oldWidget); |