Fix the scrollbar issue. We can live with the setSingleStep nasty workaround for...

[dolphin.git] / src / dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 2bb145cc4c30bdeac6476d6275472923a89d8430..ba82fc901ae1f8dabc750684ea74aadab4bac3ad 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -28,17 +28,20 @@
 #include "dolphin_detailsmodesettings.h"
 
 #include <kdirmodel.h>
-#include <kfileitemdelegate.h>
 
+#include <QApplication>
 #include <QHeaderView>
 #include <QRubberBand>
+#include <QPainter>
 #include <QScrollBar>
 
 DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) :
     QTreeView(parent),
     m_controller(controller),
-    m_rubberBand(0),
-    m_origin()
+    m_dragging(false),
+    m_showElasticBand(false),
+    m_elasticBandOrigin(),
+    m_elasticBandDestination()
 {
     Q_ASSERT(controller != 0);
 
@@ -152,38 +155,44 @@ void DolphinDetailsView::contextMenuEvent(QContextMenuEvent* event)
 
 void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
 {
+    m_controller->triggerActivation();
+
     QTreeView::mousePressEvent(event);
 
-    if (event->button() == Qt::LeftButton) {
-        // initialize rubberband for the selection
-        if (m_rubberBand == 0) {
-            m_rubberBand = new QRubberBand(QRubberBand::Rectangle, viewport());
+    const QModelIndex index = indexAt(event->pos());
+    if (!index.isValid() || (index.column() != KDirModel::Name)) {
+        const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
+        if (!(modifier & Qt::ShiftModifier) && !(modifier & Qt::ControlModifier)) {
+            clearSelection();
         }
+    }
+
+    if (event->button() == Qt::LeftButton) {
+        m_showElasticBand = true;
 
         const QPoint pos(contentsPos());
-        m_origin = event->pos();
-        m_origin.setX(m_origin.x() + pos.x());
-        m_origin.setY(m_origin.y() + pos.y());
-        updateRubberBandGeometry();
-        m_rubberBand->show();
+        m_elasticBandOrigin = event->pos();
+        m_elasticBandOrigin.setX(m_elasticBandOrigin.x() + pos.x());
+        m_elasticBandOrigin.setY(m_elasticBandOrigin.y() + pos.y());
+        m_elasticBandDestination = event->pos();
     }
 }
 
 void DolphinDetailsView::mouseMoveEvent(QMouseEvent* event)
 {
     QTreeView::mouseMoveEvent(event);
-    if (m_rubberBand != 0) {
-        updateRubberBandGeometry();
+    if (m_showElasticBand) {
+        updateElasticBand();
     }
 }
 
 void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event)
 {
     QTreeView::mouseReleaseEvent(event);
-    if (m_rubberBand != 0) {
-        m_rubberBand->hide();
+    if (m_showElasticBand) {
+        updateElasticBand();
+        m_showElasticBand = false;
     }
-    m_controller->triggerActivation();
 }
 
 void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)
@@ -191,8 +200,36 @@ void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)
     if (event->mimeData()->hasUrls()) {
         event->acceptProposedAction();
     }
-    if (m_rubberBand != 0) {
-        m_rubberBand->hide();
+
+    if (m_showElasticBand) {
+        updateElasticBand();
+        m_showElasticBand = false;
+    }
+    m_dragging = true;
+}
+
+void DolphinDetailsView::dragLeaveEvent(QDragLeaveEvent* event)
+{
+    QTreeView::dragLeaveEvent(event);
+
+    // TODO: remove this code when the issue #160611 is solved in Qt 4.4
+    m_dragging = false;
+    setDirtyRegion(m_dropRect);
+}
+
+void DolphinDetailsView::dragMoveEvent(QDragMoveEvent* event)
+{
+    QTreeView::dragMoveEvent(event);
+
+    // TODO: remove this code when the issue #160611 is solved in Qt 4.4
+    setDirtyRegion(m_dropRect);
+    const QModelIndex index = indexAt(event->pos());
+    if (!index.isValid() || (index.column() != KDirModel::Name)) {
+        m_dragging = false;
+    } else {
+        m_dragging = true;
+        m_dropRect = visualRect(index);
+        setDirtyRegion(m_dropRect);
     }
 }
 
@@ -206,6 +243,33 @@ void DolphinDetailsView::dropEvent(QDropEvent* event)
                                           event->source());
     }
     QTreeView::dropEvent(event);
+    m_dragging = false;
+}
+
+void DolphinDetailsView::paintEvent(QPaintEvent* event)
+{
+    QTreeView::paintEvent(event);
+    if (m_showElasticBand) {
+        // The following code has been taken from QListView
+        // and adapted to DolphinDetailsView.
+        // (C) 1992-2007 Trolltech ASA
+        QStyleOptionRubberBand opt;
+        opt.initFrom(this);
+        opt.shape = QRubberBand::Rectangle;
+        opt.opaque = false;
+        opt.rect = elasticBandRect();
+
+        QPainter painter(viewport());
+        painter.save();
+        style()->drawControl(QStyle::CE_RubberBand, &opt, &painter);
+        painter.restore();
+    }
+
+    // TODO: remove this code when the issue #160611 is solved in Qt 4.4
+    if (m_dragging) {
+        const QBrush& brush = m_viewOptions.palette.brush(QPalette::Normal, QPalette::Highlight);
+        DolphinController::drawHoverIndication(viewport(), m_dropRect, brush);
+    }
 }
 
 void DolphinDetailsView::setSortIndicatorSection(DolphinView::Sorting sorting)
@@ -242,14 +306,13 @@ void DolphinDetailsView::slotEntered(const QModelIndex& index)
     }
 }
 
-void DolphinDetailsView::updateRubberBandGeometry()
+void DolphinDetailsView::updateElasticBand()
 {
-    if (m_rubberBand != 0) {
-        const QPoint pos(contentsPos());
-        const QPoint origin(m_origin.x() - pos.x(), m_origin.y() - pos.y());
-        const QPoint dest(viewport()->mapFromGlobal(QCursor::pos()));
-        m_rubberBand->setGeometry(QRect(origin, dest).normalized());
-    }
+    Q_ASSERT(m_showElasticBand);
+    QRect dirtyRegion(elasticBandRect());
+    m_elasticBandDestination = viewport()->mapFromGlobal(QCursor::pos());
+    dirtyRegion = dirtyRegion.united(elasticBandRect());
+    setDirtyRegion(dirtyRegion);
 }
 
 void DolphinDetailsView::zoomIn()
@@ -322,4 +385,11 @@ QPoint DolphinDetailsView::contentsPos() const
     return QPoint(0, y);
 }
 
+QRect DolphinDetailsView::elasticBandRect() const
+{
+    const QPoint pos(contentsPos());
+    const QPoint topLeft(m_elasticBandOrigin.x() - pos.x(), m_elasticBandOrigin.y() - pos.y());
+    return QRect(topLeft, m_elasticBandDestination).normalized();
+}
+
 #include "dolphindetailsview.moc"