┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/kitemviews
diff options
context:
space:
mode:
authorPeter Penz <[email protected]>2012-02-02 09:37:25 +0100
committerPeter Penz <[email protected]>2012-02-02 09:39:28 +0100
commit110dd6de3cadefddf3a52088ab9eea13db9135b6 (patch)
treec7d4b24406738e94f9bc73026530cc0cf4267cb3 /src/kitemviews
parent6db0bec32548fd6c1d742defba5dbf958e61f45c (diff)
Fix pending zooming animation
If doLayout() is invoked with the 'NoAnimation' hint, it must be assured that any ongoing animations are stopped.
Diffstat (limited to 'src/kitemviews')
-rw-r--r--src/kitemviews/kitemlistview.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index 8aa984e4b..d09018474 100644
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -1353,12 +1353,6 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int cha
}
applyNewPos = false;
}
- } else if (m_animation->isStarted(widget, KItemListViewAnimation::MovingAnimation)) {
- if (animate) {
- applyNewPos = false;
- } else {
- m_animation->stop(widget);
- }
}
if (animate) {
@@ -1386,6 +1380,8 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int cha
// The size of the view might have been changed. Animate the moving of the position.
applyNewPos = !moveWidget(widget, itemBounds);
}
+ } else {
+ m_animation->stop(widget);
}
if (applyNewPos) {