add an explicit way to stop
svn path=/trunk/KDE/kdelibs/; revision=1094245
This commit is contained in:
parent
2b9a4f4e63
commit
ce3762373f
@ -198,6 +198,14 @@ public:
|
||||
*/
|
||||
void unregisterScrollingManager(QGraphicsWidget *widget);
|
||||
|
||||
/**
|
||||
* Stop any scrolling that could be happening on widget
|
||||
*
|
||||
* @param the widget that must stop animating
|
||||
* @since 4.5
|
||||
*/
|
||||
void stopScrollingWidget(QGraphicsWidget *widget);
|
||||
|
||||
Q_SIGNALS:
|
||||
void animationFinished(QGraphicsItem *item, Plasma::Animator::Animation anim);
|
||||
void movementFinished(QGraphicsItem *item);
|
||||
|
@ -782,5 +782,12 @@ void Animator::unregisterScrollingManager(QGraphicsWidget *widget)
|
||||
}
|
||||
}
|
||||
|
||||
void Animator::stopScrollingWidget(QGraphicsWidget *widget)
|
||||
{
|
||||
if (d->scrollingManagers.contains(widget)) {
|
||||
d->scrollingManagers.value(widget)->stop();
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace Plasma
|
||||
|
||||
|
@ -369,6 +369,12 @@ void KineticScrolling::setWidget(QGraphicsWidget *parent)
|
||||
/* TODO: add a new property in plasma::ScrollWidget 'hasOvershoot' */
|
||||
}
|
||||
|
||||
void KineticScrolling::stop()
|
||||
{
|
||||
d->scrollAnimation->stop();
|
||||
}
|
||||
|
||||
|
||||
bool KineticScrolling::eventFilter(QObject *watched, QEvent *event)
|
||||
{
|
||||
Q_UNUSED(watched);
|
||||
@ -378,11 +384,6 @@ bool KineticScrolling::eventFilter(QObject *watched, QEvent *event)
|
||||
return false;
|
||||
}
|
||||
|
||||
if (event->type() == QEvent::GraphicsSceneMove) {
|
||||
d->scrollAnimation->stop();
|
||||
return false;
|
||||
}
|
||||
|
||||
bool notBlocked = true;
|
||||
if (d->multitouchGesture == KineticScrollingPrivate::GestureNone &&
|
||||
d->parent && d->parent->scene()) {
|
||||
|
@ -40,6 +40,7 @@ public:
|
||||
KineticScrolling(QGraphicsWidget *parent);
|
||||
~KineticScrolling();
|
||||
void setWidget(QGraphicsWidget *parent);
|
||||
void stop();
|
||||
|
||||
Q_SIGNALS:
|
||||
void stateChanged(QAbstractAnimation::State newState,
|
||||
|
Loading…
Reference in New Issue
Block a user