X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7f4e9d9ed908eaa10659cbd04f53a82e28e8a59b..47d7cdffdd2d2c04067a5088eaeff67add53dde3:/src/kitemviews/kitemlistcontroller.cpp

diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index 69320247a..c0f565b4d 100644
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -23,10 +23,14 @@
 
 #include "kitemlistcontroller.h"
 
+#include <KGlobalSettings>
+#include <KDebug>
+
 #include "kitemlistview.h"
-#include "kitemlistrubberband_p.h"
 #include "kitemlistselectionmanager.h"
-#include "kitemlistkeyboardsearchmanager_p.h"
+
+#include "private/kitemlistrubberband.h"
+#include "private/kitemlistkeyboardsearchmanager.h"
 
 #include <QApplication>
 #include <QDrag>
@@ -37,9 +41,6 @@
 #include <QMimeData>
 #include <QTimer>
 
-#include <KGlobalSettings>
-#include <KDebug>
-
 KItemListController::KItemListController(QObject* parent) :
     QObject(parent),
     m_singleClickActivation(KGlobalSettings::singleClick()),
@@ -202,7 +203,7 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
         default:            break;
         }
     }
-    
+
     const bool selectSingleItem = m_selectionBehavior != NoSelection &&
                                   itemCount == 1 &&
                                   (key == Qt::Key_Home || key == Qt::Key_End  ||
@@ -454,9 +455,7 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const
 
     m_pressedMousePos = transform.map(event->pos());
     m_pressedIndex = m_view->itemAt(m_pressedMousePos);
-    if (m_pressedIndex >= 0) {
-        emit itemPressed(m_pressedIndex, event->button());
-    }
+    emit mouseButtonPressed(m_pressedIndex, event->buttons());
 
     if (m_view->isAboveExpansionToggle(m_pressedIndex, m_pressedMousePos)) {
         m_selectionManager->endAnchoredSelection();
@@ -637,9 +636,7 @@ bool KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, con
         return false;
     }
 
-    if (m_pressedIndex >= 0) {
-        emit itemReleased(m_pressedIndex, event->button());
-    }
+    emit mouseButtonReleased(m_pressedIndex, event->buttons());
 
     const bool isAboveSelectionToggle = m_view->isAboveSelectionToggle(m_pressedIndex, m_pressedMousePos);
     if (isAboveSelectionToggle) {
@@ -732,6 +729,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);
@@ -747,6 +746,8 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons
         return false;
     }
 
+    event->acceptProposedAction();
+
     KItemListWidget* oldHoveredWidget = hoveredWidget();
 
     const QPointF pos = transform.map(event->pos());
@@ -785,6 +786,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);