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

fix horizontal kinetic scrolling

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1026072
This commit is contained in:
Igor Trindade Oliveira 2009-09-20 18:21:41 +00:00
parent ce0cb1e916
commit 03dbe67aae
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
private/kineticscroll.cpp
View File

@ -46,7 +46,7 @@ class KineticScrollingPrivate
{ {
public: public:
KineticScrollingPrivate(): mScrollVelocity(0), timerID(0), KineticScrollingPrivate(): mScrollVelocity(0), timerID(0),
overshoot(40), bounceFlag(0) overshoot(40), bounceFlag(0), hasOvershoot(true)
{ } { }
void count() void count()
@ -81,6 +81,7 @@ public:
int timerID, overshoot, direction; int timerID, overshoot, direction;
QPoint cposition, minimalPos, maximumPos; QPoint cposition, minimalPos, maximumPos;
char bounceFlag; char bounceFlag;
bool hasOvershoot;
QGraphicsWidget *widget; QGraphicsWidget *widget;
QGraphicsWidget *scrollingWidget; QGraphicsWidget *scrollingWidget;
@ -159,7 +160,7 @@ void KineticScrolling::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
d->direction = KineticScrollingPrivate::Down; d->direction = KineticScrollingPrivate::Down;
} else { } else {
d->direction = KineticScrollingPrivate::None; d->direction = KineticScrollingPrivate::None;
d->mScrollVelocity = (d->kinMovement.x() + d->kinMovement.y())>>2; d->mScrollVelocity = d->kinMovement.x() + d->kinMovement.y();
startAnimationTimer(30); startAnimationTimer(30);
return; return;
} }
@ -231,13 +232,13 @@ void KineticScrolling::setKineticScrollValue(QPoint value)
d->widget->setPos(d->cposition); d->widget->setPos(d->cposition);
if (d->cposition.y() == d->overshoot) { if ((d->cposition.y() == d->overshoot) && d->hasOvershoot) {
d->direction = KineticScrollingPrivate::Up; d->direction = KineticScrollingPrivate::Up;
killTimer(d->timerID); killTimer(d->timerID);
d->mScrollVelocity = 5; d->mScrollVelocity = 5;
startAnimationTimer(30); startAnimationTimer(30);
} else if (d->cposition.y() == d->minimalPos.y()) { } else if ((d->cposition.y() == d->minimalPos.y()) && d->hasOvershoot) {
d->direction = KineticScrollingPrivate::Down; d->direction = KineticScrollingPrivate::Down;
killTimer(d->timerID); killTimer(d->timerID);
d->mScrollVelocity = 5; d->mScrollVelocity = 5;
@ -289,7 +290,6 @@ void KineticScrolling::bounceTimer()
} }
} }
void KineticScrolling::doneOvershoot(void) void KineticScrolling::doneOvershoot(void)
{ {
d->direction = KineticScrollingPrivate::None; d->direction = KineticScrollingPrivate::None;
@ -303,6 +303,32 @@ void KineticScrolling::setWidgets(QGraphicsWidget *widget,
{ {
d->widget = widget; d->widget = widget;
d->scrollingWidget = scrolling; d->scrollingWidget = scrolling;
if(d->widget->size().height() <= d->scrollingWidget->size().height()) {
d->hasOvershoot = false;
d->overshoot = 0;
}
d->widget->installEventFilter(this);
}
bool KineticScrolling::eventFilter(QObject *watched, QEvent *event)
{
const int threashold = 10;
if (!d->widget) {
return false;
}
if (watched == d->widget && event->type() == QEvent::GraphicsSceneResize) {
if(d->widget->size().height() <= d->scrollingWidget->size().height()+threashold) {
d->hasOvershoot = false;
d->overshoot = 0;
} else {
d->hasOvershoot = true;
d->overshoot = 40;
}
}
return false;
} }
} // namespace Plasma } // namespace Plasma

1
private/kineticscroll_p.h
View File

@ -47,6 +47,7 @@ class KineticScrolling: public QObject
private: private:
KineticScrollingPrivate *d; KineticScrollingPrivate *d;
void timerEvent(QTimerEvent *event); void timerEvent(QTimerEvent *event);
bool eventFilter(QObject *watched, QEvent *event);
void bounceTimer(); void bounceTimer();
qreal duration(); qreal duration();
QPoint movement(); QPoint movement();