X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/518372394da1f58da8e69acbb981a97db375e739..bd925ea49a7e4e7c6e652f4529dcd0c4e25fd19a:/src/dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index c8c419f02..53bf4e2a7 100644
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -49,7 +49,6 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     m_controller(controller),
     m_font(),
     m_decorationSize(),
-    m_dragging(false),
     m_showElasticBand(false),
     m_elasticBandOrigin(),
     m_elasticBandDestination()
@@ -69,7 +68,6 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     setItemsExpandable(settings->expandableFolders());
 
     setMouseTracking(true);
-    viewport()->setAttribute(Qt::WA_Hover);
 
     const ViewProperties props(controller->url());
     setSortIndicatorSection(props.sorting());
@@ -129,14 +127,8 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
                        settings->italicFont());
     }
 
-// TODO: Remove this check when 4.3.2 is released and KDE requires it... this
-//       check avoids a division by zero happening on versions before 4.3.1.
-//       Right now KDE in theory can be shipped with Qt 4.3.0 and above.
-//       ereslibre
-#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2) || defined(QT_KDE_QT_COPY))
     setVerticalScrollMode(QTreeView::ScrollPerPixel);
     setHorizontalScrollMode(QTreeView::ScrollPerPixel);
-#endif
 
     updateDecorationSize();
 
@@ -161,19 +153,12 @@ bool DolphinDetailsView::event(QEvent* event)
 
         hideColumn(DolphinModel::Rating);
         hideColumn(DolphinModel::Tags);
-    }
-// TODO: Remove this check when 4.3.2 is released and KDE requires it... this
-//       check avoids a division by zero happening on versions before 4.3.1.
-//       Right now KDE in theory can be shipped with Qt 4.3.0 and above.
-//       ereslibre
-#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2) || defined(QT_KDE_QT_COPY))
-    else if (event->type() == QEvent::UpdateRequest) {
+    } else if (event->type() == QEvent::UpdateRequest) {
         // a wheel movement will scroll 4 items
         if (model()->rowCount() > 0) {
             verticalScrollBar()->setSingleStep((sizeHintForRow(0) / 3) * 4);
         }
     }
-#endif
 
     return QTreeView::event(event);
 }
@@ -237,30 +222,17 @@ void DolphinDetailsView::mouseMoveEvent(QMouseEvent* event)
             setSelection(selRect, QItemSelectionModel::Select);
         }
 
-        // TODO: see comment at end of method
+        // TODO: enable QTreeView::mouseMoveEvent(event) again, as soon
+        // as the Qt-issue #199631 has been fixed.
         // QTreeView::mouseMoveEvent(event);
         QAbstractItemView::mouseMoveEvent(event);
         updateElasticBand();
     } else {
-        // TODO: see comment at end of method
-        //QTreeView::mouseMoveEvent(event);
+        // TODO: enable QTreeView::mouseMoveEvent(event) again, as soon
+        // as the Qt-issue #199631 has been fixed.
+        // QTreeView::mouseMoveEvent(event);
         QAbstractItemView::mouseMoveEvent(event);
     }
-
-    // The original implementation of QTreeView::mouseMoveEvent() looks like this (Qt4.4):
-    //
-    // void QTreeView::mouseMoveEvent(QMouseEvent *event)
-    // {
-    //     Q_D(QTreeView);
-    //     if (d->itemDecorationAt(event->pos()) == -1) // ### what about expanding/collapsing state ?
-    //         QAbstractItemView::mouseMoveEvent(event);
-    // }
-    //
-    // This prevents that the signal 'entered()' is emitted when the mouse is above a decoration,
-    // although the hovered item has changed. The SelectionManager is connected to 'entered()'
-    // and assumes that the old item is selected. This is currently bypassed by skipping
-    // the base implementation and invoking QAbstractItemView::mouseMoveEvent() directly.
-    // Submitted a bug report to Trolltech, bug ID is still pending.
 }
 
 void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event)
@@ -287,15 +259,11 @@ void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)
         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);
 }
 
@@ -306,10 +274,7 @@ void DolphinDetailsView::dragMoveEvent(QDragMoveEvent* 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() != DolphinModel::Name)) {
-        m_dragging = false;
-    } else {
-        m_dragging = true;
+    if (index.isValid() && (index.column() == DolphinModel::Name)) {
         const KFileItem item = m_controller->itemForIndex(index);
         if (!item.isNull() && item.isDir()) {
             m_dropRect = visualRect(index);
@@ -340,7 +305,6 @@ void DolphinDetailsView::dropEvent(QDropEvent* event)
                                           item);
     }
     QTreeView::dropEvent(event);
-    m_dragging = false;
 }
 
 void DolphinDetailsView::paintEvent(QPaintEvent* event)
@@ -361,12 +325,6 @@ void DolphinDetailsView::paintEvent(QPaintEvent* event)
         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 = viewOptions().palette.brush(QPalette::Normal, QPalette::Highlight);
-        DragAndDropHelper::drawHoverIndication(this, m_dropRect, brush);
-    }
 }
 
 void DolphinDetailsView::keyPressEvent(QKeyEvent* event)
@@ -386,7 +344,6 @@ void DolphinDetailsView::resizeEvent(QResizeEvent* event)
 void DolphinDetailsView::wheelEvent(QWheelEvent* event)
 {
     // let Ctrl+wheel events propagate to the DolphinView for icon zooming
-    // (installing an event filter does not work, as the wheel event is handled first)
     if (event->modifiers() & Qt::ControlModifier) {
         event->ignore();
         return;
@@ -394,6 +351,12 @@ void DolphinDetailsView::wheelEvent(QWheelEvent* event)
     QTreeView::wheelEvent(event);
 }
 
+void DolphinDetailsView::currentChanged(const QModelIndex& current, const QModelIndex& previous)
+{
+    QTreeView::currentChanged(current, previous);
+    selectionModel()->select(current, QItemSelectionModel::ClearAndSelect);
+}
+
 void DolphinDetailsView::setSortIndicatorSection(DolphinView::Sorting sorting)
 {
     QHeaderView* headerView = header();