From 074acd8009765f5e6ad5cb7f1887d50f4aea5a58 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sat, 20 Aug 2011 13:52:36 +0200 Subject: Fix possible endless recursion when using the rubberband If the autoscrolling has been activated when using the rubberband, it was possible that an endless recursion occured as the autoscrolling triggered a change of the rubberband which triggered a change of the autoscrolling etc. --- src/kitemviews/kitemlistcontainer.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/kitemviews/kitemlistcontainer.h') diff --git a/src/kitemviews/kitemlistcontainer.h b/src/kitemviews/kitemlistcontainer.h index 0cda436d0..5f846a9bf 100644 --- a/src/kitemviews/kitemlistcontainer.h +++ b/src/kitemviews/kitemlistcontainer.h @@ -25,6 +25,7 @@ #include +#include #include class KItemListController; @@ -59,6 +60,7 @@ protected: private slots: void slotModelChanged(KItemModelBase* current, KItemModelBase* previous); void slotViewChanged(KItemListView* current, KItemListView* previous); + void slotAnimationStateChanged(QAbstractAnimation::State newState, QAbstractAnimation::State oldState); void scrollTo(qreal offset); void updateScrollBars(); @@ -69,8 +71,8 @@ private: private: KItemListController* m_controller; - bool m_sliderMovedByUser; - QPropertyAnimation* m_viewOffsetAnimation; + bool m_smoothScrolling; + QPropertyAnimation* m_smoothScrollingAnimation; }; #endif -- cgit v1.3.1