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 239cf2e6c4b3c2d33bb46921e487e8b95d7155ac..1ad760ae2c34b944593716671112e09052bffc24 100644 (file)
--- 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 f1822826d101e2bee8015ef9fe566098d3b91937..d7777b541380ed3c0c04df22b9fb15df4496e739 100644 (file)
--- 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