From: Peter Penz Date: Fri, 9 Mar 2012 16:57:19 +0000 (+0100) Subject: Prevent endless scrolling of list when dragging items X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/956d32ed16f69ccde41f5ee74a158676d336a383 Prevent endless scrolling of list when dragging items BUG: 295584 FIXED-IN: 4.8.2 --- diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp index 239cf2e6c..1ad760ae2 100644 --- a/src/kitemviews/kitemlistcontroller.cpp +++ b/src/kitemviews/kitemlistcontroller.cpp @@ -732,6 +732,8 @@ bool KItemListController::dragLeaveEvent(QGraphicsSceneDragDropEvent* event, con Q_UNUSED(event); Q_UNUSED(transform); + m_view->setAutoScroll(false); + KItemListWidget* widget = hoveredWidget(); if (widget) { widget->setHovered(false); @@ -785,6 +787,7 @@ bool KItemListController::dropEvent(QGraphicsSceneDragDropEvent* event, const QT } m_autoActivationTimer->stop(); + m_view->setAutoScroll(false); const QPointF pos = transform.map(event->pos()); const int index = m_view->itemAt(pos); diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index f1822826d..d7777b541 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -299,7 +299,6 @@ void KItemListView::setAutoScroll(bool enabled) delete m_autoScrollTimer; m_autoScrollTimer = 0; } - } bool KItemListView::autoScroll() const