diff options
| author | Katja Marttila <katja.marttila@digia.com> | 2015-03-03 12:23:29 +0200 |
|---|---|---|
| committer | Thorbjørn Lund Martsum <tmartsum@gmail.com> | 2015-04-29 15:21:43 +0000 |
| commit | 2596f95b3b2a1be31b13af1dc9a43198b6eca5bc (patch) | |
| tree | 0060d18d4788d8c6ea50673b335fc1bfc62a2731 /src/widgets/itemviews/qtreeview.cpp | |
| parent | 7f8da2179b7542375d9cf472b74bb8c2b83435f1 (diff) | |
Fix QTreeView ending up in wrong state when drag
Changed state in MouseRelease so that QTreeView
does not end up in wrong state if drag is started
but not completed.
Task-number: QTBUG-44773
Change-Id: I0b665d2944f2b696bc4b7e79689d110aefa3f194
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Diffstat (limited to 'src/widgets/itemviews/qtreeview.cpp')
| -rw-r--r-- | src/widgets/itemviews/qtreeview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp index 188a503d10..43db43fcd4 100644 --- a/src/widgets/itemviews/qtreeview.cpp +++ b/src/widgets/itemviews/qtreeview.cpp @@ -1913,7 +1913,7 @@ void QTreeView::mouseReleaseEvent(QMouseEvent *event) if (d->itemDecorationAt(event->pos()) == -1) { QAbstractItemView::mouseReleaseEvent(event); } else { - if (state() == QAbstractItemView::DragSelectingState) + if (state() == QAbstractItemView::DragSelectingState || state() == QAbstractItemView::DraggingState) setState(QAbstractItemView::NoState); if (style()->styleHint(QStyle::SH_ListViewExpand_SelectMouseType, 0, this) == QEvent::MouseButtonRelease) d->expandOrCollapseItemAtPos(event->pos()); |