X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d0c97573d4cee67974758349ddcfc2fee509785d..0772ebc3aaa1ea4717aedcdd7dacc95dedf8a307:/src/dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index f92a28e79..acfff6a65 100644
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -23,7 +23,7 @@
 #include "dolphinmodel.h"
 #include "dolphincontroller.h"
 #include "dolphinfileitemdelegate.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinviewautoscroller.h"
 #include "draganddrophelper.h"
@@ -55,6 +55,7 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     m_ignoreScrollTo(false),
     m_controller(controller),
     m_selectionManager(0),
+    m_autoScroller(0),
     m_font(),
     m_decorationSize(),
     m_band()
@@ -76,7 +77,7 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     setEditTriggers(QAbstractItemView::NoEditTriggers);
 
     setMouseTracking(true);
-    new DolphinViewAutoScroller(this);
+    m_autoScroller = new DolphinViewAutoScroller(this);
 
     const ViewProperties props(controller->url());
     setSortIndicatorSection(props.sorting());
@@ -209,7 +210,6 @@ void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
             setState(QAbstractItemView::DraggingState);
         } else {
             m_expandingTogglePressed = true;
-            kDebug() << "m_expandingTogglePressed " << m_expandingTogglePressed;
         }
     }
 
@@ -236,9 +236,8 @@ void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
             m_band.show = true;
             // Incremental update data will not be useful - start from scratch.
             m_band.ignoreOldInfo = true;
-            const QPoint pos = contentsPos();
             const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
-            m_band.origin = event->pos() + pos + scrollPos;
+            m_band.origin = event->pos()  + scrollPos;
             m_band.destination = m_band.origin;
             m_band.originalSelection = selectionModel()->selection();
         }
@@ -424,7 +423,7 @@ void DolphinDetailsView::wheelEvent(QWheelEvent* event)
 void DolphinDetailsView::currentChanged(const QModelIndex& current, const QModelIndex& previous)
 {
     QTreeView::currentChanged(current, previous);
-    if (current.isValid()) {
+    if (current.isValid() && !m_autoScroller->isActive()) {
         scrollTo(current);
     }
 
@@ -456,7 +455,7 @@ QModelIndex DolphinDetailsView::indexAt(const QPoint& point) const
     return isAboveEmptySpace ? QModelIndex() : index;
 }
 
-void DolphinDetailsView::setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command)
+void DolphinDetailsView::setSelection(const QRect& rect, QItemSelectionModel::SelectionFlags command)
 {
     // We must override setSelection() as Qt calls it internally and when this happens
     // we must ensure that the default indexAt() is used.
@@ -465,7 +464,6 @@ void DolphinDetailsView::setSelection(const QRect &rect, QItemSelectionModel::Se
         QTreeView::setSelection(rect, command);
         m_useDefaultIndexAt = false;
     } else {
-
         // Use our own elastic band selection algorithm
         updateElasticBandSelection();
     }
@@ -473,21 +471,19 @@ void DolphinDetailsView::setSelection(const QRect &rect, QItemSelectionModel::Se
 
 void DolphinDetailsView::scrollTo(const QModelIndex & index, ScrollHint hint)
 {
-    if (m_ignoreScrollTo)
-        return;
-    QTreeView::scrollTo(index, hint);
+    if (!m_ignoreScrollTo) {
+        QTreeView::scrollTo(index, hint);
+    }
 }
 
 void DolphinDetailsView::setSortIndicatorSection(DolphinView::Sorting sorting)
 {
-    QHeaderView* headerView = header();
-    headerView->setSortIndicator(sorting, headerView->sortIndicatorOrder());
+    header()->setSortIndicator(sorting, header()->sortIndicatorOrder());
 }
 
 void DolphinDetailsView::setSortIndicatorOrder(Qt::SortOrder sortOrder)
 {
-    QHeaderView* headerView = header();
-    headerView->setSortIndicator(headerView->sortIndicatorSection(), sortOrder);
+    header()->setSortIndicator(header()->sortIndicatorSection(), sortOrder);
 }
 
 void DolphinDetailsView::synchronizeSortingState(int column)
@@ -517,11 +513,12 @@ void DolphinDetailsView::updateElasticBand()
         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)
+        if (m_band.destination.y() < 0) {
             m_band.destination.setY(0);
-        if (m_band.destination.x() < 0)
+        }
+        if (m_band.destination.x() < 0) {
             m_band.destination.setX(0);
-
+        }
         dirtyRegion = dirtyRegion.united(elasticBandRect());
         setDirtyRegion(dirtyRegion);
     }
@@ -529,11 +526,10 @@ void DolphinDetailsView::updateElasticBand()
 
 QRect DolphinDetailsView::elasticBandRect() const
 {
-    const QPoint pos(contentsPos());
     const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
 
-    const QPoint topLeft = m_band.origin - pos - scrollPos;
-    const QPoint bottomRight = m_band.destination - pos - scrollPos;
+    const QPoint topLeft = m_band.origin - scrollPos;
+    const QPoint bottomRight = m_band.destination - scrollPos;
     return QRect(topLeft, bottomRight).normalized();
 }
 
@@ -617,8 +613,10 @@ void DolphinDetailsView::slotHeaderSectionResized(int logicalIndex, int oldSize,
     Q_UNUSED(newSize);
     // 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()) {
+    // section has been resized by the user or by a resize event, another approach is used.
+    // Attention: Take care when changing the if-condition to verify that there is no
+    // regression in combination with bug 178630 (see fix in comment #8).
+    if ((QApplication::mouseButtons() & Qt::LeftButton) && header()->underMouse()) {
         disableAutoResizing();
     }
 }
@@ -845,24 +843,6 @@ void DolphinDetailsView::updateDecorationSize(bool showPreview)
     doItemsLayout();
 }
 
-QPoint DolphinDetailsView::contentsPos() const
-{
-    // implementation note: the horizonal position is ignored currently, as no
-    // horizontal scrolling is done anyway during a selection
-    const QScrollBar* scrollbar = verticalScrollBar();
-    Q_ASSERT(scrollbar != 0);
-
-    const int maxHeight = maximumViewportSize().height();
-    const int height = scrollbar->maximum() - scrollbar->minimum() + 1;
-    const int visibleHeight = model()->rowCount() + 1 - height;
-    if (visibleHeight <= 0) {
-        return QPoint(0, 0);
-    }
-
-    const int y = scrollbar->sliderPosition() * maxHeight / visibleHeight;
-    return QPoint(0, y);
-}
-
 KFileItemDelegate::Information DolphinDetailsView::infoForColumn(int columnIndex) const
 {
     KFileItemDelegate::Information info = KFileItemDelegate::NoInformation;