X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/f158bf097a079cba181afa9ecc03e5eb20f3573a..4e2f3dcffe2c2388e9d2d63e626ee6d03abce953:/src/kitemviews/kitemlistview.cpp

diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index a3fc2bafc..5f4c54606 100644
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -36,6 +36,7 @@
 
 #include <QCursor>
 #include <QGraphicsSceneMouseEvent>
+#include <QGraphicsView>
 #include <QPainter>
 #include <QPropertyAnimation>
 #include <QStyle>
@@ -83,7 +84,8 @@ KItemListView::KItemListView(QGraphicsWidget* parent) :
     m_autoScrollIncrement(0),
     m_autoScrollTimer(0),
     m_header(0),
-    m_headerWidget(0)
+    m_headerWidget(0),
+    m_dropIndicator()
 {
     setAcceptHoverEvents(true);
 
@@ -566,8 +568,21 @@ KItemListHeader* KItemListView::header() const
 
 QPixmap KItemListView::createDragPixmap(const QSet<int>& indexes) const
 {
-    Q_UNUSED(indexes);
-    return QPixmap();
+    QPixmap pixmap;
+
+    if (indexes.count() == 1) {
+        KItemListWidget* item = m_visibleItems.value(indexes.toList().first());
+        QGraphicsView* graphicsView = scene()->views()[0];
+        if (item && graphicsView) {
+            pixmap = item->createDragPixmap(0, graphicsView);
+        }
+    } else {
+        // TODO: Not implemented yet. Probably extend the interface
+        // from KItemListWidget::createDragPixmap() to return a pixmap
+        // that can be used for multiple indexes.
+    }
+
+    return pixmap;
 }
 
 void KItemListView::editRole(int index, const QByteArray& role)
@@ -608,6 +623,22 @@ void KItemListView::paint(QPainter* painter, const QStyleOptionGraphicsItem* opt
         opt.rect = rubberBandRect.toRect();
         style()->drawControl(QStyle::CE_RubberBand, &opt, painter);
     }
+
+    if (!m_dropIndicator.isEmpty()) {
+        const QRectF r = m_dropIndicator.toRect();
+
+        QColor color = palette().brush(QPalette::Normal, QPalette::Highlight).color();
+        painter->setPen(color);
+
+        // TODO: The following implementation works only for a vertical scroll-orientation
+        // and assumes a height of the m_draggingInsertIndicator of 1.
+        Q_ASSERT(r.height() == 1);
+        painter->drawLine(r.left() + 1, r.top(), r.right() - 1, r.top());
+
+        color.setAlpha(128);
+        painter->setPen(color);
+        painter->drawRect(r.left(), r.top() - 1, r.width() - 1, 2);
+    }
 }
 
 void KItemListView::setItemSize(const QSizeF& size)
@@ -960,9 +991,17 @@ void KItemListView::slotItemsInserted(const KItemRangeList& itemRanges)
 #endif
         m_endTransactionAnimationHint = NoAnimation;
         endTransaction();
+
         updateSiblingsInformation();
     }
 
+    if (m_grouped && (hasMultipleRanges || itemRanges.first().count < m_model->count())) {
+        // In case if items of the same group have been inserted before an item that
+        // currently represents the first item of the group, the group header of
+        // this item must be removed.
+        updateVisibleGroupHeaders();
+    }
+
     if (useAlternateBackgrounds()) {
         updateAlternateBackgrounds();
     }
@@ -1049,12 +1088,6 @@ void KItemListView::slotItemsRemoved(const KItemRangeList& itemRanges)
             }
         }
 
-        // In case if the first item of a group has been removed, the group header
-        // must be applied to the next visible item.
-        if (m_grouped && index < m_model->count()) {
-            updateGroupHeaderForWidget(m_visibleItems.value(index));
-        }
-
         if (!hasMultipleRanges) {
             // The decrease-layout-size optimization in KItemListView::slotItemsInserted()
             // assumes an updated geometry. If items are removed during an active transaction,
@@ -1084,6 +1117,12 @@ void KItemListView::slotItemsRemoved(const KItemRangeList& itemRanges)
         updateSiblingsInformation();
     }
 
+    if (m_grouped && (hasMultipleRanges || m_model->count() > 0)) {
+        // In case if the first item of a group has been removed, the group header
+        // must be applied to the next visible item.
+        updateVisibleGroupHeaders();
+    }
+
     if (useAlternateBackgrounds()) {
         updateAlternateBackgrounds();
     }
@@ -1577,6 +1616,11 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int cha
         }
 
         if (animate) {
+            if (m_animation->isStarted(widget, KItemListViewAnimation::MovingAnimation)) {
+                m_animation->start(widget,  KItemListViewAnimation::MovingAnimation, newPos);
+                applyNewPos = false;
+            }
+
             const bool itemsRemoved = (changedCount < 0);
             const bool itemsInserted = (changedCount > 0);
             if (itemsRemoved && (i >= changedIndex + changedCount + 1)) {
@@ -1898,8 +1942,10 @@ void KItemListView::updateGroupHeaderLayout(KItemListWidget* widget)
         // In the vertical scroll orientation the group header should always span
         // the whole width no matter which temporary position the parent widget
         // has. In this case the x-position and width will be adjusted manually.
-        groupHeader->setPos(-widget->x(), -groupHeaderRect.height());
-        groupHeader->resize(size().width(), groupHeaderRect.size().height());
+        const qreal x = -widget->x() - itemOffset();
+        const qreal width = maximumItemOffset();
+        groupHeader->setPos(x, -groupHeaderRect.height());
+        groupHeader->resize(width, groupHeaderRect.size().height());
     } else {
         groupHeader->setPos(groupHeaderRect.x() - itemRect.x(), -widget->y());
         groupHeader->resize(groupHeaderRect.size());
@@ -2262,6 +2308,45 @@ bool KItemListView::scrollBarRequired(const QSizeF& size) const
                                                            : maxOffset > size.width();
 }
 
+int KItemListView::showDropIndicator(const QPointF& pos)
+{
+    QHashIterator<int, KItemListWidget*> it(m_visibleItems);
+    while (it.hasNext()) {
+        it.next();
+        const KItemListWidget* widget = it.value();
+
+        const QPointF mappedPos = widget->mapFromItem(this, pos);
+        const QRectF rect = itemRect(widget->index());
+        if (mappedPos.y() >= 0 && mappedPos.y() <= rect.height()) {
+            const bool isAboveItem = (mappedPos.y () < rect.height() / 2);
+            const qreal y = isAboveItem ? rect.top() : rect.bottom();
+
+            const QRectF draggingInsertIndicator(rect.left(), y, rect.width(), 1);
+            if (m_dropIndicator != draggingInsertIndicator) {
+                m_dropIndicator = draggingInsertIndicator;
+                update();
+            }
+
+            int index = widget->index();
+            if (!isAboveItem) {
+                ++index;
+            }
+            return index;
+        }
+    }
+
+    const QRectF firstItemRect = itemRect(firstVisibleIndex());
+    return (pos.y() <= firstItemRect.top()) ? 0 : -1;
+}
+
+void KItemListView::hideDropIndicator()
+{
+    if (!m_dropIndicator.isNull()) {
+        m_dropIndicator = QRectF();
+        update();
+    }
+}
+
 void KItemListView::updateGroupHeaderHeight()
 {
     qreal groupHeaderHeight = m_styleOption.fontMetrics.height();