assure that no expensive operations are done when the Information Panel has been...

[dolphin.git] / src / dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 6d9038b46e026744f00282850ef7e89beb03108e..5c77ff7107e1057974a5115805b270bc8ef82f06 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -47,16 +47,16 @@
 
 DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) :
     QTreeView(parent),
-       m_autoResize(true),
+    m_autoResize(true),
     m_expandingTogglePressed(false),
     m_keyPressed(false),
     m_useDefaultIndexAt(true),
+    m_ignoreScrollTo(false),
     m_controller(controller),
     m_selectionManager(0),
     m_font(),
     m_decorationSize(),
-    m_band(),
-    m_ignoreScrollTo(false)
+    m_band()
 {
     const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
     Q_ASSERT(settings != 0);
@@ -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);
     }
@@ -606,7 +613,10 @@ void DolphinDetailsView::slotHeaderSectionResized(int logicalIndex, int oldSize,
     Q_UNUSED(logicalIndex);
     Q_UNUSED(oldSize);
     Q_UNUSED(newSize);
-    if (QApplication::mouseButtons() & Qt::LeftButton) {
+    // If the user changes the size of the headers, the autoresize feature should be
+    // turned off. As there is no dedicated interface to find out whether the header
+    // section has been resized by the user or by a resize event, the following approach is used:
+    if ((QApplication::mouseButtons() & Qt::LeftButton) && isVisible()) {
         disableAutoResizing();
     }
 }
@@ -654,6 +664,9 @@ void DolphinDetailsView::updateElasticBandSelection()
     QRect selRect = elasticBandRect().normalized();
     QRect nameColumnArea(nameColumnX, selRect.y(), nameColumnWidth, selRect.height());
     selRect = nameColumnArea.intersect(selRect).normalized();
+    // Get the last elastic band rectangle, expressed in viewpoint coordinates.
+    const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
+    QRect oldSelRect = QRect(m_band.lastSelectionOrigin - scrollPos, m_band.lastSelectionDestination - scrollPos).normalized();
 
     if (selRect.isNull()) {
         selectionModel()->select(m_band.originalSelection, QItemSelectionModel::ClearAndSelect);
@@ -670,17 +683,16 @@ void DolphinDetailsView::updateElasticBandSelection()
             // No items in the model presumably.
             return;
         }
-        
+
         // If the elastic band does not cover the same rows as before, we'll
         // need to re-check, and also invalidate the old item distances.
         const int rowHeight = QTreeView::rowHeight(dummyIndex);
         const bool coveringSameRows =
-            (selRect.top()    / rowHeight == m_band.oldSelectionRect.top()    / rowHeight) &&
-            (selRect.bottom() / rowHeight == m_band.oldSelectionRect.bottom() / rowHeight);
+            (selRect.top()    / rowHeight == oldSelRect.top()    / rowHeight) &&
+            (selRect.bottom() / rowHeight == oldSelRect.bottom() / rowHeight);
         if (coveringSameRows) {
             // Covering the same rows, but have we moved far enough horizontally 
             // that we might have (de)selected some other items?
-            const QRect oldSelRect = m_band.oldSelectionRect;
             const bool itemSelectionChanged =
                 ((selRect.left() > oldSelRect.left()) &&
                  (selRect.left() > m_band.insideNearestLeftEdge)) ||
@@ -697,9 +709,11 @@ 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.oldSelectionRect = selRect;
+        m_band.lastSelectionOrigin = QPoint();
+        m_band.lastSelectionDestination = QPoint();
+        oldSelRect = selRect;
     }
 
     // Do the selection from scratch. Force a update of the horizontal distances info.
@@ -710,7 +724,7 @@ void DolphinDetailsView::updateElasticBandSelection()
 
     // Include the old selection rect as well, so we can deselect
     // items that were inside it but not in the new selRect.
-    const QRect boundingRect = selRect.united(m_band.oldSelectionRect).normalized();
+    const QRect boundingRect = selRect.united(oldSelRect).normalized();
     if (boundingRect.isNull()) {
         return;
     }
@@ -735,7 +749,7 @@ void DolphinDetailsView::updateElasticBandSelection()
    QModelIndex currIndex = startIndex;
    QModelIndex lastIndex;
    bool allItemsInBoundDone = false;
-   
+
    // Calling selectionModel()->select(...) for each item that needs to be 
    // toggled is slow as each call emits selectionChanged(...) so store them
    // and do the selection toggle in one batch.
@@ -748,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();
@@ -810,7 +824,8 @@ void DolphinDetailsView::updateElasticBandSelection()
 
     selectionModel()->select(itemsToToggle, QItemSelectionModel::Toggle);
 
-    m_band.oldSelectionRect = selRect;
+    m_band.lastSelectionOrigin = m_band.origin;
+    m_band.lastSelectionDestination = m_band.destination;
     m_band.ignoreOldInfo = false;
 }
 
@@ -915,7 +930,8 @@ DolphinDetailsView::ElasticBand::ElasticBand() :
     show(false),
     origin(),
     destination(),
-    oldSelectionRect(),
+    lastSelectionOrigin(),
+    lastSelectionDestination(),
     ignoreOldInfo(true),
     outsideNearestLeftEdge(0),
     outsideNearestRightEdge(0),