alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ssssh

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1153771
This commit is contained in:
Aaron J. Seigo 2010-07-24 00:52:37 +00:00
parent 90c8d09d11
commit fc92307f06
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
private/kineticscroll.cpp
View File

@ -224,6 +224,8 @@ void KineticScrolling::resetAnimation(QPointF finalPosition, int duration)
void KineticScrolling::mousePressEvent(QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(event);
if (d->scrollAnimation->state() != QAbstractAnimation::Stopped) {
d->scrollAnimation->stop();
}
@ -282,8 +284,8 @@ void KineticScrolling::wheelReleaseEvent(QGraphicsSceneWheelEvent *event)
d->kinMovement = QPointF(0,0);
if((event->orientation() == Qt::Vertical) &&
((event->delta() < 0) && d->canScroll(KineticScrollingPrivate::Down) ||
(event->delta() > 0) && d->canScroll(KineticScrollingPrivate::Up))) {
(((event->delta() < 0) && d->canScroll(KineticScrollingPrivate::Down)) ||
((event->delta() > 0) && d->canScroll(KineticScrollingPrivate::Up)))) {
d->kinMovement.setY(d->kinMovement.y() - event->delta());
} else if ((event->orientation() == Qt::Vertical) ||
(!d->canScroll(KineticScrollingPrivate::Down) &&