summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Penz <peter.penz19@gmail.com>2012-03-09 16:57:19 (GMT)
committerPeter Penz <peter.penz19@gmail.com>2012-03-09 16:58:09 (GMT)
commit6bf5f888c6735407645b53da82f57ec557fad5fc (patch)
tree5452eb3ff99566167838394162c0ef5f5bfa3e2b
parent97662eee998f1c417be0ffa901d7063ca183585c (diff)
Prevent endless scrolling of list when dragging items
BUG: 295584 FIXED-IN: 4.8.2
-rw-r--r--dolphin/src/kitemviews/kitemlistcontroller.cpp3
-rw-r--r--dolphin/src/kitemviews/kitemlistview.cpp1
2 files changed, 3 insertions, 1 deletions
diff --git a/dolphin/src/kitemviews/kitemlistcontroller.cpp b/dolphin/src/kitemviews/kitemlistcontroller.cpp
index 239cf2e..1ad760a 100644
--- a/dolphin/src/kitemviews/kitemlistcontroller.cpp
+++ b/dolphin/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/dolphin/src/kitemviews/kitemlistview.cpp b/dolphin/src/kitemviews/kitemlistview.cpp
index f182282..d7777b5 100644
--- a/dolphin/src/kitemviews/kitemlistview.cpp
+++ b/dolphin/src/kitemviews/kitemlistview.cpp
@@ -299,7 +299,6 @@ void KItemListView::setAutoScroll(bool enabled)
delete m_autoScrollTimer;
m_autoScrollTimer = 0;
}
-
}
bool KItemListView::autoScroll() const