First step for having a details view, where only the icon + name act as selectable...

Currently it is very confusing that although only the icon + name is selectable, still the selection and hovering is drawn above the whole column width. This will be fixed before KDE 4.2.

CCBUG: 165999
CCMAIL: simon@etotheipiplusone.com

svn path=/trunk/KDE/kdebase/apps/; revision=871834

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 79a1a106d04612ff7dab19a73b5440b05ff20189..045ea6a6a74eaf8d61bd60e18cf9037aa135f612 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -49,6 +49,7 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
        m_autoResize(true),
     m_expandingTogglePressed(false),
     m_keyPressed(false),
        m_autoResize(true),
     m_expandingTogglePressed(false),
     m_keyPressed(false),

+    m_useDefaultIndexAt(true),

     m_controller(controller),
     m_selectionManager(0),
     m_font(),
     m_controller(controller),
     m_selectionManager(0),
     m_font(),


@@ -149,6 +150,8 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
 
     connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
             this, SLOT(updateFont()));
 
     connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
             this, SLOT(updateFont()));

+            
+    m_useDefaultIndexAt = false;

 }
 
 DolphinDetailsView::~DolphinDetailsView()
 }
 
 DolphinDetailsView::~DolphinDetailsView()


@@ -215,6 +218,7 @@ void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
     }
 
     if (!index.isValid() || (index.column() != DolphinModel::Name)) {
     }
 
     if (!index.isValid() || (index.column() != DolphinModel::Name)) {

+        // the mouse press is done somewhere outside the filename column

         if (QApplication::mouseButtons() & Qt::MidButton) {
             m_controller->replaceUrlByClipboard();
         }
         if (QApplication::mouseButtons() & Qt::MidButton) {
             m_controller->replaceUrlByClipboard();
         }


@@ -230,12 +234,10 @@ void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
 
     if ((event->button() == Qt::LeftButton) && !m_expandingTogglePressed) {
         m_showElasticBand = true;
 
     if ((event->button() == Qt::LeftButton) && !m_expandingTogglePressed) {
         m_showElasticBand = true;

-
-        const QPoint pos(contentsPos());
-        m_elasticBandOrigin = event->pos();
-        m_elasticBandOrigin.setX(m_elasticBandOrigin.x() + pos.x());
-        m_elasticBandOrigin.setY(m_elasticBandOrigin.y() + pos.y());
-        m_elasticBandDestination = event->pos();
+        const QPoint pos = contentsPos();
+        const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
+        m_elasticBandOrigin = event->pos() + pos + scrollPos;
+        m_elasticBandDestination = m_elasticBandOrigin;

     }
 }
 
     }
 }
 


@@ -249,13 +251,15 @@ void DolphinDetailsView::mouseMoveEvent(QMouseEvent* event)
             // case QTreeView does no selection at all, which is not the wanted behavior
             // in Dolphin -> select all items within the elastic band rectangle
             clearSelection();
             // case QTreeView does no selection at all, which is not the wanted behavior
             // in Dolphin -> select all items within the elastic band rectangle
             clearSelection();

+            setState(DragSelectingState);

 
             const int nameColumnWidth = header()->sectionSize(DolphinModel::Name);
 
             const int nameColumnWidth = header()->sectionSize(DolphinModel::Name);

-            QRect selRect = QRect(m_elasticBandOrigin, m_elasticBandDestination).normalized();
+            QRect selRect = elasticBandRect();

             const QRect nameColumnsRect(0, 0, nameColumnWidth, viewport()->height());
             selRect = nameColumnsRect.intersected(selRect);
 
             setSelection(selRect, QItemSelectionModel::Select);
             const QRect nameColumnsRect(0, 0, nameColumnWidth, viewport()->height());
             selRect = nameColumnsRect.intersected(selRect);
 
             setSelection(selRect, QItemSelectionModel::Select);

+

         }
 
         // TODO: enable QTreeView::mouseMoveEvent(event) again, as soon
         }
 
         // TODO: enable QTreeView::mouseMoveEvent(event) again, as soon


@@ -295,6 +299,7 @@ void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event)
 
     m_expandingTogglePressed = false;
     if (m_showElasticBand) {
 
     m_expandingTogglePressed = false;
     if (m_showElasticBand) {

+        setState(NoState);

         updateElasticBand();
         m_showElasticBand = false;
     }
         updateElasticBand();
         m_showElasticBand = false;
     }


@@ -441,6 +446,51 @@ bool DolphinDetailsView::eventFilter(QObject* watched, QEvent* event)
     return QTreeView::eventFilter(watched, event);
 }
 
     return QTreeView::eventFilter(watched, event);
 }
 

+QModelIndex DolphinDetailsView::indexAt(const QPoint& point) const
+{
+    // the blank portion of the name column counts as empty space
+    const QModelIndex index = QTreeView::indexAt(point);
+    const bool isAboveEmptySpace  = !m_useDefaultIndexAt &&
+                                    (index.column() == KDirModel::Name) && !nameColumnRect(index).contains(point);
+    return isAboveEmptySpace ? QModelIndex() : index;
+}
+
+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.
+    if (!m_showElasticBand) {
+        m_useDefaultIndexAt = true;
+        QTreeView::setSelection(rect, command);
+        m_useDefaultIndexAt = false;
+    } else {
+        // Select the items contained within the elastic band.
+
+        // TODO - would this still work if the columns could be re-ordered
+        // (which I want to implement eventually :))?
+
+        // Very naive implementation - clears all selected, then walks a tree,
+        // selecting all items whose nameColumnRect(...) intersects rect.
+
+        // Choose a sensible startIndex - a parentless index in the 
+        // name column, as close to the top of the rect as we 
+        // can find.
+        QRect normalisedRect = rect.normalized();
+        QModelIndex startIndex = QTreeView::indexAt(normalisedRect.topLeft());
+        if (startIndex.isValid()) {
+            while (startIndex.parent().isValid()) {
+                startIndex = startIndex.parent();
+            }
+        } else {
+            // just pick the topmost row for safety
+            model()->index(0, KDirModel::Name);
+        }
+        startIndex = model()->index(startIndex.row(), KDirModel::Name);
+        clearSelection();
+        setSelectionRecursive(startIndex, normalisedRect, command);
+    }
+}
+

 void DolphinDetailsView::setSortIndicatorSection(DolphinView::Sorting sorting)
 {
     QHeaderView* headerView = header();
 void DolphinDetailsView::setSortIndicatorSection(DolphinView::Sorting sorting)
 {
     QHeaderView* headerView = header();


@@ -475,8 +525,9 @@ void DolphinDetailsView::slotEntered(const QModelIndex& index)
 void DolphinDetailsView::updateElasticBand()
 {
     if (m_showElasticBand) {
 void DolphinDetailsView::updateElasticBand()
 {
     if (m_showElasticBand) {

-        QRect dirtyRegion(elasticBandRect());
-        m_elasticBandDestination = viewport()->mapFromGlobal(QCursor::pos());
+        QRect dirtyRegion(elasticBandRect());        
+        const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
+        m_elasticBandDestination = viewport()->mapFromGlobal(QCursor::pos()) + scrollPos;

         dirtyRegion = dirtyRegion.united(elasticBandRect());
         setDirtyRegion(dirtyRegion);
     }
         dirtyRegion = dirtyRegion.united(elasticBandRect());
         setDirtyRegion(dirtyRegion);
     }


@@ -485,8 +536,11 @@ void DolphinDetailsView::updateElasticBand()
 QRect DolphinDetailsView::elasticBandRect() const
 {
     const QPoint pos(contentsPos());
 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();
+    const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
+
+    const QPoint topLeft = m_elasticBandOrigin - pos - scrollPos;
+    const QPoint bottomRight = m_elasticBandDestination - pos - scrollPos;
+    return QRect(topLeft, bottomRight).normalized();

 }
 
 void DolphinDetailsView::setZoomLevel(int level)
 }
 
 void DolphinDetailsView::setZoomLevel(int level)


@@ -681,4 +735,59 @@ void DolphinDetailsView::resizeColumns()
     headerView->resizeSection(KDirModel::Name, columnWidth[KDirModel::Name]);
 }
 
     headerView->resizeSection(KDirModel::Name, columnWidth[KDirModel::Name]);
 }
 

+QRect DolphinDetailsView::nameColumnRect(const QModelIndex& index) const
+{
+    // TODO: The code guesses the width of the name, but it is defined
+    // by KFileItemDelegate. Find a way to tell the item delegate to
+    // use a specified width.
+    QRect guessedItemContentRect = visualRect(index);
+    const KFileItem fileItem = m_controller->itemForIndex(index);
+    if (!fileItem.isNull()) {
+        QStyleOptionViewItem itemStyle = viewOptions();        
+        QFontMetrics fontMetrics(itemStyle.font);
+        const int itemContentWidth = itemStyle.decorationSize.width() + fontMetrics.width(fileItem.name());
+        guessedItemContentRect.setWidth(itemContentWidth);
+    }
+
+    return guessedItemContentRect;
+}
+
+void DolphinDetailsView::setSelectionRecursive(const QModelIndex& startIndex,
+                                               const QRect& rect,
+                                               QItemSelectionModel::SelectionFlags command)
+{
+    if (!startIndex.isValid()) {
+        return;
+    }
+    
+    // rect is assumed to be in viewport coordinates and normalized.
+    // Move down through the siblings of startIndex, exploring the children
+    // of any expanded nodes.
+    Q_ASSERT(rect.width() >= 0 && rect.height() >= 0);
+    QModelIndex currIndex = startIndex;
+    do {
+        const QModelIndex belowIndex = indexBelow(currIndex);
+        if (isExpanded(currIndex)) {
+            // If belowIndex exists and is above the top of rect, then we need not explore
+            // the children of currIndex as they will always be above "below".  Otherwise,
+            // explore the children.
+            if (!belowIndex.isValid() || visualRect(belowIndex).bottom() >= rect.top()) {
+                setSelectionRecursive(currIndex.child(0, currIndex.column()), rect, command);
+            }
+        }
+
+        QRect itemContentRect = nameColumnRect(currIndex);
+        if (itemContentRect.top() > rect.bottom()) {
+            // All remaining items will be below itemContentRect, so we may cull.
+            return;
+        }
+
+        if (itemContentRect.intersects(rect)) {
+            selectionModel()->select(currIndex, QItemSelectionModel::Select);   
+        }
+
+        currIndex = belowIndex;
+    } while (currIndex.isValid());
+}
+

 #include "dolphindetailsview.moc"
 #include "dolphindetailsview.moc"

diff --git a/src/dolphindetailsview.h b/src/dolphindetailsview.h
index bd8f1e8a8983c708c7b957e65715c52773f04101..512bd6201fee5ef770717cb7685bbcdf0ce1c596 100644 (file)
--- a/src/dolphindetailsview.h
+++ b/src/dolphindetailsview.h
@@ -63,6 +63,8 @@ protected:
     virtual void wheelEvent(QWheelEvent* event);
     virtual void currentChanged(const QModelIndex& current, const QModelIndex& previous);
     virtual bool eventFilter(QObject* watched, QEvent* event);
     virtual void wheelEvent(QWheelEvent* event);
     virtual void currentChanged(const QModelIndex& current, const QModelIndex& previous);
     virtual bool eventFilter(QObject* watched, QEvent* event);

+    virtual QModelIndex indexAt (const QPoint& point) const;
+    virtual void setSelection(const QRect& rect, QItemSelectionModel::SelectionFlags command);

 
 private slots:
     /**
 
 private slots:
     /**


@@ -160,10 +162,17 @@ private:
      */
     void resizeColumns();
 
      */
     void resizeColumns();
 

+    QRect nameColumnRect(const QModelIndex& index) const;
+
+    void setSelectionRecursive(const QModelIndex& startIndex,
+                               const QRect& rect,
+                               QItemSelectionModel::SelectionFlags command);
+

 private:
 private:

-       bool m_autoResize;  // if true, the columns are resized automatically to the available width
-    bool m_expandingTogglePressed;
-    bool m_keyPressed;  // true if a key is pressed currently; info used by currentChanged()
+       bool m_autoResize : 1;        // if true, the columns are resized automatically to the available width
+    bool m_expandingTogglePressed : 1;
+    bool m_keyPressed : 1;        // true if a key is pressed currently; info used by currentChanged()
+    bool m_useDefaultIndexAt : 1; // true, if QTreeView::indexAt() should be used

 
     DolphinController* m_controller;
     SelectionManager* m_selectionManager;
 
     DolphinController* m_controller;
     SelectionManager* m_selectionManager;


@@ -173,9 +182,12 @@ private:
 
     QRect m_dropRect;
 
 
     QRect m_dropRect;
 

+    // Elastic band coordinates are relative to the origin of the
+    // view, not the viewport.

     bool m_showElasticBand;
     QPoint m_elasticBandOrigin;
     QPoint m_elasticBandDestination;
     bool m_showElasticBand;
     QPoint m_elasticBandOrigin;
     QPoint m_elasticBandDestination;

+

 };
 
 #endif
 };
 
 #endif