X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/4eaced49cd50642d3be152b9c68612a0f4a6c03b..040bdcea237e2576aad744bc4e7b5cadedcc98dc:/src/dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 883f5a774..5c77ff710 100644
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -307,13 +307,13 @@ void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event)
 
 void DolphinDetailsView::startDrag(Qt::DropActions supportedActions)
 {
-    DragAndDropHelper::startDrag(this, supportedActions, m_controller);
+    DragAndDropHelper::instance().startDrag(this, supportedActions, m_controller);
     m_band.show = false;
 }
 
 void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)
 {
-    if (DragAndDropHelper::isMimeDataSupported(event->mimeData())) {
+    if (DragAndDropHelper::instance().isMimeDataSupported(event->mimeData())) {
         event->acceptProposedAction();
     }
 
@@ -346,7 +346,7 @@ void DolphinDetailsView::dragMoveEvent(QDragMoveEvent* event)
         setDirtyRegion(m_dropRect);
     }
 
-    if (DragAndDropHelper::isMimeDataSupported(event->mimeData())) {
+    if (DragAndDropHelper::instance().isMimeDataSupported(event->mimeData())) {
         // accept url drops, independently from the destination item
         event->acceptProposedAction();
     }
@@ -514,6 +514,13 @@ void DolphinDetailsView::updateElasticBand()
         QRect dirtyRegion(elasticBandRect());        
         const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
         m_band.destination = viewport()->mapFromGlobal(QCursor::pos()) + scrollPos;
+        // Going above the (logical) top-left of the view causes complications during selection;
+        // we may as well prevent it.
+        if (m_band.destination.y() < 0)
+            m_band.destination.setY(0);
+        if (m_band.destination.x() < 0)
+            m_band.destination.setX(0);
+            
         dirtyRegion = dirtyRegion.united(elasticBandRect());
         setDirtyRegion(dirtyRegion);
     }
@@ -702,7 +709,7 @@ void DolphinDetailsView::updateElasticBandSelection()
         }
     }
     else {
-        // This is the only piece of optimisation data that needs to be explicitly
+        // This is the only piece of optimization data that needs to be explicitly
         // discarded.
         m_band.lastSelectionOrigin = QPoint();
         m_band.lastSelectionDestination = QPoint();
@@ -755,7 +762,7 @@ void DolphinDetailsView::updateElasticBandSelection()
    do {
        QRect currIndexRect = nameColumnRect(currIndex);
 
-        // Update some optimisation info as we go.
+        // Update some optimization info as we go.
        const int cr = currIndexRect.right();
        const int cl = currIndexRect.left();
        const int sl = selRect.left();