KItemList: fix warnings

[dolphin.git] / src / kitemviews / kitemlistview.cpp

diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index 77114735bada9a536beb366f736d41b2798d33fe..eb74b96558c8de617e33d88c5f0c6e279762c789 100644 (file)
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -77,7 +77,6 @@ KItemListView::KItemListView(QGraphicsWidget* parent) :
     m_visibleItems(),
     m_visibleGroups(),
     m_visibleCells(),
     m_visibleItems(),
     m_visibleGroups(),
     m_visibleCells(),

-    m_sizeHintResolver(nullptr),

     m_layouter(nullptr),
     m_animation(nullptr),
     m_oldScrollOffset(0),
     m_layouter(nullptr),
     m_animation(nullptr),
     m_oldScrollOffset(0),


@@ -93,7 +92,8 @@ KItemListView::KItemListView(QGraphicsWidget* parent) :
     m_header(nullptr),
     m_headerWidget(nullptr),
     m_indicatorAnimation(nullptr),
     m_header(nullptr),
     m_headerWidget(nullptr),
     m_indicatorAnimation(nullptr),

-    m_dropIndicator()
+    m_dropIndicator(),
+    m_sizeHintResolver(nullptr)

 {
     setAcceptHoverEvents(true);
     setAcceptTouchEvents(true);
 {
     setAcceptHoverEvents(true);
     setAcceptTouchEvents(true);


@@ -1858,6 +1858,8 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int cha
         Q_ASSERT(widget->index() == i);
         widget->setVisible(true);
 
         Q_ASSERT(widget->index() == i);
         widget->setVisible(true);
 

+        bool animateIconResizing = animate;
+

         if (widget->size() != itemBounds.size()) {
             // Resize the widget for the item to the changed size.
             if (animate) {
         if (widget->size() != itemBounds.size()) {
             // Resize the widget for the item to the changed size.
             if (animate) {


@@ -1874,11 +1876,13 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int cha
             } else {
                 widget->resize(itemBounds.size());
             }
             } else {
                 widget->resize(itemBounds.size());
             }

+        } else {
+            animateIconResizing = false;

         }
 
         const int newIconSize = widget->styleOption().iconSize;
         if (widget->iconSize() != newIconSize) {
         }
 
         const int newIconSize = widget->styleOption().iconSize;
         if (widget->iconSize() != newIconSize) {

-            if (animate) {
+            if (animateIconResizing) {

                 m_animation->start(widget, KItemListViewAnimation::IconResizeAnimation, newIconSize);
             } else {
                 widget->setIconSize(newIconSize);
                 m_animation->start(widget, KItemListViewAnimation::IconResizeAnimation, newIconSize);
             } else {
                 widget->setIconSize(newIconSize);