summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsauimone <samu.uimonen@digia.com>2012-10-05 13:46:33 +0300
committersauimone <samu.uimonen@digia.com>2012-10-17 10:46:30 +0300
commit0b10e25383455264220446417c7c69da3b143470 (patch)
tree0677c4646ba2a4c76fedea54366cc77bf0c7bbc1
parent2e3db467e0a5e2d4879358eaef69cbb32b4ca8b7 (diff)
minor code style fix
-rw-r--r--src/scroller.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/scroller.cpp b/src/scroller.cpp
index 22d00276..b392247d 100644
--- a/src/scroller.cpp
+++ b/src/scroller.cpp
@@ -65,10 +65,11 @@ void Scroller::release(const QPointF &delta)
// Release was quick enough. Start scrolling.
qreal interval = 25;
qreal time = m_timeStamp.msecsTo(QTime::currentTime());
- if (qFuzzyIsNull(time))
+ if (qFuzzyIsNull(time)) {
m_speed = delta / 5;
- else
+ } else {
m_speed = delta * interval / time;
+ }
qreal fraction = qMax(qAbs(m_speed.x()), qAbs(m_speed.y()));
@@ -80,10 +81,8 @@ void Scroller::release(const QPointF &delta)
m_fraction.setY(1);
}
startTicker(interval);
- m_state = Scroll;
} else {
stopTicker(); // Stop ticker, if one is running.
- m_state = Idle;
}
}