--- a/webengine/osswebengine/WebKit/s60/webview/WebScrollingDeceleratorGH.cpp Wed Mar 31 23:16:40 2010 +0300
+++ b/webengine/osswebengine/WebKit/s60/webview/WebScrollingDeceleratorGH.cpp Wed Apr 14 17:06:56 2010 +0300
@@ -108,6 +108,7 @@
{
m_decelelatorSwitch = false;
if (m_decelTimer->IsActive()) {
+ m_webView.setScrolling(false);
m_decelTimer->Cancel();
}
}
@@ -135,11 +136,13 @@
m_numscrollsteps = 0;
if (m_decelTimer->IsActive()) {
+ m_webView.setScrolling(false);
m_decelTimer->Cancel();
}
WebFrameView* scrollingView = m_webView.pageScrollHandler()->currentScrollingFrameView();
if (scrollingView) {
+ m_webView.setScrolling(true);
m_startPos = scrollingView->contentPos();
m_lastPos = m_startPos;
m_decelTimer->Start(0, KScrollIntervalTimeout,
@@ -190,6 +193,7 @@
if (m_scrollbarDrawer) {
m_scrollbarDrawer->fadeScrollbar();
}
+ m_webView.setScrolling(false);
m_decelTimer->Cancel();
handler->clearScrollingElement();
m_webView.setViewIsScrolling(false);