Make moving animations less obtrusive

Only animate the moving of items if the new position is within the same
row or the same column. Otherwise just fade in the icon on the new position.
This makes the the animations when resizing the window or changing the zoom-level
a lot more pleasant.

CCBUG: 289238

diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index 281fe96f844226809f4be786ff41092e190275ba..578865741846ce725fbae4d450aa5249ef56dc35 100644 (file)
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -1310,27 +1310,7 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int cha
 
     const int lastVisibleIndex = m_layouter->lastVisibleIndex();
 
 
     const int lastVisibleIndex = m_layouter->lastVisibleIndex();
 

-    // Determine all items that are completely invisible and might be
-    // reused for items that just got (at least partly) visible.
-    // Items that do e.g. an animated moving of their position are not
-    // marked as invisible: This assures that a scrolling inside the view
-    // can be done without breaking an animation.
-    QList<int> reusableItems;
-    QHashIterator<int, KItemListWidget*> it(m_visibleItems);
-    while (it.hasNext()) {
-        it.next();
-        KItemListWidget* widget = it.value();
-        const int index = widget->index();
-        const bool invisible = (index < firstVisibleIndex) || (index > lastVisibleIndex);
-        if (invisible && !m_animation->isStarted(widget)) {
-            widget->setVisible(false);
-            reusableItems.append(index);
-
-            if (m_grouped) {
-                recycleGroupHeaderForWidget(widget);
-            }
-        }
-    }
+    QList<int> reusableItems = recycleInvisibleItems(firstVisibleIndex, lastVisibleIndex);

 
     // Assure that for each visible item a KItemListWidget is available. KItemListWidget
     // instances from invisible items are reused. If no reusable items are
 
     // Assure that for each visible item a KItemListWidget is available. KItemListWidget
     // instances from invisible items are reused. If no reusable items are


@@ -1383,8 +1363,7 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int cha
             const bool itemsInserted = (changedCount > 0);
             if (itemsRemoved && (i >= changedIndex + changedCount + 1)) {
                 // The item is located after the removed items. Animate the moving of the position.
             const bool itemsInserted = (changedCount > 0);
             if (itemsRemoved && (i >= changedIndex + changedCount + 1)) {
                 // The item is located after the removed items. Animate the moving of the position.

-                m_animation->start(widget, KItemListViewAnimation::MovingAnimation, newPos);
-                applyNewPos = false;
+                applyNewPos = !moveWidget(widget, newPos);

             } else if (itemsInserted && i >= changedIndex) {
                 // The item is located after the first inserted item
                 if (i <= changedIndex + changedCount - 1) {
             } else if (itemsInserted && i >= changedIndex) {
                 // The item is located after the first inserted item
                 if (i <= changedIndex + changedCount - 1) {


@@ -1398,13 +1377,11 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int cha
                     // The item was already there before, so animate the moving of the position.
                     // No moving animation is done if the item is animated by a create animation: This
                     // prevents a "move animation mess" when inserting several ranges in parallel.
                     // The item was already there before, so animate the moving of the position.
                     // No moving animation is done if the item is animated by a create animation: This
                     // prevents a "move animation mess" when inserting several ranges in parallel.

-                    m_animation->start(widget, KItemListViewAnimation::MovingAnimation, newPos);
-                    applyNewPos = false;
+                    applyNewPos = !moveWidget(widget, newPos);

                 }
             } else if (!itemsRemoved && !itemsInserted && !wasHidden) {
                 // The size of the view might have been changed. Animate the moving of the position.
                 }
             } else if (!itemsRemoved && !itemsInserted && !wasHidden) {
                 // The size of the view might have been changed. Animate the moving of the position.

-                m_animation->start(widget, KItemListViewAnimation::MovingAnimation, newPos);
-                applyNewPos = false;
+                applyNewPos = !moveWidget(widget, newPos);

             }
         }
 
             }
         }
 


@@ -1451,6 +1428,55 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int cha
     emitOffsetChanges();
 }
 
     emitOffsetChanges();
 }
 

+QList<int> KItemListView::recycleInvisibleItems(int firstVisibleIndex, int lastVisibleIndex)
+{
+    // Determine all items that are completely invisible and might be
+    // reused for items that just got (at least partly) visible.
+    // Items that do e.g. an animated moving of their position are not
+    // marked as invisible: This assures that a scrolling inside the view
+    // can be done without breaking an animation.
+
+    QList<int> items;
+
+    QHashIterator<int, KItemListWidget*> it(m_visibleItems);
+    while (it.hasNext()) {
+        it.next();
+        KItemListWidget* widget = it.value();
+        const int index = widget->index();
+        const bool invisible = (index < firstVisibleIndex) || (index > lastVisibleIndex);
+        if (invisible && !m_animation->isStarted(widget)) {
+            widget->setVisible(false);
+            items.append(index);
+
+            if (m_grouped) {
+                recycleGroupHeaderForWidget(widget);
+            }
+        }
+    }
+
+    return items;
+}
+
+bool KItemListView::moveWidget(KItemListWidget* widget, const QPointF& newPos)
+{
+    // The moving-animation should only be started, if it is done within one
+    // row or one column. Otherwise instead of a moving-animation a
+    // create-animation on the new position will be used instead. This is done
+    // to prevent "irritating" moving-animations.
+    const QPointF oldPos = widget->pos();
+    const qreal xDiff = qAbs(oldPos.x() - newPos.x());
+    const qreal yDiff = qAbs(oldPos.y() - newPos.y());
+    if (xDiff <= m_itemSize.width() || yDiff <= m_itemSize.height()) {
+        // The moving animation is done inside a column or a row.
+        m_animation->start(widget, KItemListViewAnimation::MovingAnimation, newPos);
+        return true;
+    }
+
+    m_animation->stop(widget);
+    m_animation->start(widget, KItemListViewAnimation::CreateAnimation);
+    return false;
+}
+

 void KItemListView::emitOffsetChanges()
 {
     const qreal newScrollOffset = m_layouter->scrollOffset();
 void KItemListView::emitOffsetChanges()
 {
     const qreal newScrollOffset = m_layouter->scrollOffset();

diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h
index 4969d01b704c839174001441694bb1bf8f5c165a..e4f1cd0d9972acfe7be357699990de855aefca51 100644 (file)
--- a/src/kitemviews/kitemlistview.h
+++ b/src/kitemviews/kitemlistview.h
@@ -344,6 +344,22 @@ private:
 
     void doLayout(LayoutAnimationHint hint, int changedIndex = 0, int changedCount = 0);
 
 
     void doLayout(LayoutAnimationHint hint, int changedIndex = 0, int changedCount = 0);
 

+    /**
+     * Helper method for doLayout: Returns a list of items that can be reused for the visible
+     * area. Invisible group headers get recycled. The reusable items are items that are
+     * invisible and not animated. Reusing items is faster in comparison to deleting invisible
+     * items and creating a new instance for visible items.
+     */
+    QList<int> recycleInvisibleItems(int firstVisibleIndex, int lastVisibleIndex);
+
+    /**
+     * Helper method for doLayout: Starts a moving-animation for the widget to the given
+     * new position. The moving-animation is only started if the new position is within
+     * the same row or column, otherwise the create-animation is used instead.
+     * @return True if the moving-animation has been applied.
+     */
+    bool moveWidget(KItemListWidget* widget, const QPointF& newPos);
+

     void emitOffsetChanges();
 
     KItemListWidget* createWidget(int index);
     void emitOffsetChanges();
 
     KItemListWidget* createWidget(int index);