Draw dragged items. Better conditions (more accurate to our behavior, hey ! we have...

CCMAIL: peter.penz@gmx.at

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

diff --git a/src/klistview.cpp b/src/klistview.cpp
index a67fc79a3c248816a85e18feb6dcf2c6727367b5..df8150a11c2bf9ff233a244f0dc46f55ae04a546 100644 (file)
--- a/src/klistview.cpp
+++ b/src/klistview.cpp
@@ -79,6 +79,7 @@ KListView::Private::Private(KListView *listView)
     : listView(listView)
     , itemCategorizer(0)
     , mouseButtonPressed(false)
     : listView(listView)
     , itemCategorizer(0)
     , mouseButtonPressed(false)

+    , isDragging(false)

     , proxyModel(0)
     , lastIndex(QModelIndex())
 {
     , proxyModel(0)
     , lastIndex(QModelIndex())
 {


@@ -392,6 +393,22 @@ void KListView::Private::updateScrollbars()
     listView->verticalScrollBar()->setRange(0, lastItemBottom);
 }
 
     listView->verticalScrollBar()->setRange(0, lastItemBottom);
 }
 

+void KListView::Private::drawDraggedItems(QPainter *painter)
+{
+    QStyleOptionViewItemV3 option = listView->viewOptions();
+    option.state &= ~QStyle::State_MouseOver;
+    foreach (const QModelIndex &index, listView->selectionModel()->selectedIndexes())
+    {
+        int dx = mousePosition.x() - initialPressPosition.x();
+        int dy = mousePosition.y() - initialPressPosition.y();
+
+        option.rect = visualRect(index);
+        option.rect.adjust(dx, dy, dx, dy);
+
+        listView->itemDelegate(index)->paint(painter, option, index);
+    }
+}
+

 
 //==============================================================================
 
 
 //==============================================================================
 


@@ -438,7 +455,7 @@ void KListView::setModel(QAbstractItemModel *model)
 
 QRect KListView::visualRect(const QModelIndex &index) const
 {
 
 QRect KListView::visualRect(const QModelIndex &index) const
 {

-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||

         !d->itemCategorizer)
     {
         return QListView::visualRect(index);
         !d->itemCategorizer)
     {
         return QListView::visualRect(index);


@@ -494,7 +511,7 @@ void KListView::setItemCategorizer(KItemCategorizer *itemCategorizer)
 
 QModelIndex KListView::indexAt(const QPoint &point) const
 {
 
 QModelIndex KListView::indexAt(const QPoint &point) const
 {

-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||

         !d->itemCategorizer)
     {
         return QListView::indexAt(point);
         !d->itemCategorizer)
     {
         return QListView::indexAt(point);


@@ -518,7 +535,7 @@ void KListView::reset()
 {
     QListView::reset();
 
 {
     QListView::reset();
 

-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||

         !d->itemCategorizer)
     {
         return;
         !d->itemCategorizer)
     {
         return;


@@ -539,7 +556,7 @@ void KListView::reset()
 
 void KListView::paintEvent(QPaintEvent *event)
 {
 
 void KListView::paintEvent(QPaintEvent *event)
 {

-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||

         !d->itemCategorizer)
     {
         QListView::paintEvent(event);
         !d->itemCategorizer)
     {
         QListView::paintEvent(event);


@@ -610,7 +627,7 @@ void KListView::paintEvent(QPaintEvent *event)
         }
     }
 
         }
     }
 

-    if (d->mouseButtonPressed)
+    if (d->mouseButtonPressed && !d->isDragging)

     {
         QPoint start, end, initialPressPosition;
 
     {
         QPoint start, end, initialPressPosition;
 


@@ -641,6 +658,9 @@ void KListView::paintEvent(QPaintEvent *event)
         painter.restore();
     }
 
         painter.restore();
     }
 

+    if (d->isDragging)
+        d->drawDraggedItems(&painter);
+

     painter.restore();
 }
 
     painter.restore();
 }
 


@@ -648,7 +668,7 @@ void KListView::resizeEvent(QResizeEvent *event)
 {
     QListView::resizeEvent(event);
 
 {
     QListView::resizeEvent(event);
 

-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||

         !d->itemCategorizer)
     {
         return;
         !d->itemCategorizer)
     {
         return;


@@ -664,7 +684,7 @@ void KListView::resizeEvent(QResizeEvent *event)
 void KListView::setSelection(const QRect &rect,
                              QItemSelectionModel::SelectionFlags flags)
 {
 void KListView::setSelection(const QRect &rect,
                              QItemSelectionModel::SelectionFlags flags)
 {

-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||

         !d->itemCategorizer)
     {
         QListView::setSelection(rect, flags);
         !d->itemCategorizer)
     {
         QListView::setSelection(rect, flags);


@@ -756,7 +776,7 @@ void KListView::mouseMoveEvent(QMouseEvent *event)
 
     d->mousePosition = event->pos();
 
 
     d->mousePosition = event->pos();
 

-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||

         !d->itemCategorizer)
     {
         return;
         !d->itemCategorizer)
     {
         return;


@@ -771,7 +791,7 @@ void KListView::mousePressEvent(QMouseEvent *event)
 {
     QListView::mousePressEvent(event);
 
 {
     QListView::mousePressEvent(event);
 

-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||

         !d->itemCategorizer)
     {
         return;
         !d->itemCategorizer)
     {
         return;


@@ -799,7 +819,7 @@ void KListView::mouseReleaseEvent(QMouseEvent *event)
 
     d->mouseButtonPressed = false;
 
 
     d->mouseButtonPressed = false;
 

-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||

         !d->itemCategorizer)
     {
         return;
         !d->itemCategorizer)
     {
         return;


@@ -856,7 +876,7 @@ void KListView::leaveEvent(QEvent *event)
 
     d->hovered = QModelIndex();
 
 
     d->hovered = QModelIndex();
 

-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||

         !d->itemCategorizer)
     {
         return;
         !d->itemCategorizer)
     {
         return;


@@ -869,9 +889,36 @@ void KListView::leaveEvent(QEvent *event)
 
 void KListView::startDrag(Qt::DropActions supportedActions)
 {
 
 void KListView::startDrag(Qt::DropActions supportedActions)
 {

+    QListView::startDrag(supportedActions);
+
+    d->isDragging = false;

     d->mouseButtonPressed = false;
     d->mouseButtonPressed = false;

+}

 
 

-    QListView::startDrag(supportedActions);
+void KListView::dragMoveEvent(QDragMoveEvent *event)
+{
+    QListView::dragMoveEvent(event);
+
+    d->mousePosition = event->pos();
+
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
+        !d->itemCategorizer)
+    {
+        return;
+    }
+
+    if (d->mouseButtonPressed)
+    {
+        d->isDragging = true;
+    }
+    else
+    {
+        d->isDragging = false;
+    }
+
+    event->accept();
+
+    viewport()->update();

 }
 
 void KListView::rowsInserted(const QModelIndex &parent,
 }
 
 void KListView::rowsInserted(const QModelIndex &parent,


@@ -880,7 +927,7 @@ void KListView::rowsInserted(const QModelIndex &parent,
 {
     QListView::rowsInserted(parent, start, end);
 
 {
     QListView::rowsInserted(parent, start, end);
 

-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||

         !d->itemCategorizer)
     {
         return;
         !d->itemCategorizer)
     {
         return;


@@ -890,8 +937,8 @@ void KListView::rowsInserted(const QModelIndex &parent,
 }
 
 void KListView::rowsInsertedArtifficial(const QModelIndex &parent,
 }
 
 void KListView::rowsInsertedArtifficial(const QModelIndex &parent,

-                                                int start,
-                                                int end)
+                                        int start,
+                                        int end)

 {
     d->elementsInfo.clear();
     d->elementsPosition.clear();
 {
     d->elementsInfo.clear();
     d->elementsPosition.clear();


@@ -1006,7 +1053,7 @@ void KListView::rowsRemoved(const QModelIndex &parent,
 
 void KListView::updateGeometries()
 {
 
 void KListView::updateGeometries()
 {

-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||

         !d->itemCategorizer)
     {
         QListView::updateGeometries();
         !d->itemCategorizer)
     {
         QListView::updateGeometries();

diff --git a/src/klistview.h b/src/klistview.h
index 175d3a1ac701c6ae70d7a629b031c02c2c8dd0ea..1ef6feed4564ef5b576c053ba81c7ab045d0362a 100644 (file)
--- a/src/klistview.h
+++ b/src/klistview.h
@@ -68,6 +68,8 @@ protected:
 
     virtual void startDrag(Qt::DropActions supportedActions);
 
 
     virtual void startDrag(Qt::DropActions supportedActions);
 

+    virtual void dragMoveEvent(QDragMoveEvent *event);
+

 protected Q_SLOTS:
     virtual void rowsInserted(const QModelIndex &parent,
                               int start,
 protected Q_SLOTS:
     virtual void rowsInserted(const QModelIndex &parent,
                               int start,

diff --git a/src/klistview_p.h b/src/klistview_p.h
index 4a0a53f9b2a6c64461f744e21432ab06bbfab017..d8f12a512a091e98b0ceeff82790602bdc113eef 100644 (file)
--- a/src/klistview_p.h
+++ b/src/klistview_p.h
@@ -98,6 +98,11 @@ public:
       */
     void updateScrollbars();
 
       */
     void updateScrollbars();
 

+    /**
+      * This method will draw dragged items
+      */
+    void drawDraggedItems(QPainter *painter);
+

 
     // Attributes
 
 
     // Attributes
 


@@ -113,6 +118,7 @@ public:
 
     // Behavior data
     bool mouseButtonPressed;
 
     // Behavior data
     bool mouseButtonPressed;

+    bool isDragging;

     QModelIndex hovered;
     QPoint initialPressPosition;
     QPoint mousePosition;
     QModelIndex hovered;
     QPoint initialPressPosition;
     QPoint mousePosition;