equal
deleted
inserted
replaced
107 void WebScrollingDeceleratorGH::cancelDecel() |
107 void WebScrollingDeceleratorGH::cancelDecel() |
108 { |
108 { |
109 m_decelelatorSwitch = false; |
109 m_decelelatorSwitch = false; |
110 if (m_decelTimer->IsActive()) { |
110 if (m_decelTimer->IsActive()) { |
111 m_webView.setScrolling(false); |
111 m_webView.setScrolling(false); |
|
112 m_webView.resumeJsTimers(); |
112 m_decelTimer->Cancel(); |
113 m_decelTimer->Cancel(); |
113 } |
114 } |
114 } |
115 } |
115 |
116 |
116 void WebScrollingDeceleratorGH::startDecel(TRealPoint& speed, WebScrollbarDrawer* scrollbarDrawer) |
117 void WebScrollingDeceleratorGH::startDecel(TRealPoint& speed, WebScrollbarDrawer* scrollbarDrawer) |
135 m_initSpeed.iY = (-1) * speedY; |
136 m_initSpeed.iY = (-1) * speedY; |
136 |
137 |
137 m_numscrollsteps = 0; |
138 m_numscrollsteps = 0; |
138 if (m_decelTimer->IsActive()) { |
139 if (m_decelTimer->IsActive()) { |
139 m_webView.setScrolling(false); |
140 m_webView.setScrolling(false); |
|
141 m_webView.resumeJsTimers(); |
140 m_decelTimer->Cancel(); |
142 m_decelTimer->Cancel(); |
141 } |
143 } |
142 |
144 |
143 WebFrameView* scrollingView = m_webView.pageScrollHandler()->currentScrollingFrameView(); |
145 WebFrameView* scrollingView = m_webView.pageScrollHandler()->currentScrollingFrameView(); |
144 if (scrollingView) { |
146 if (scrollingView) { |
|
147 m_webView.pauseJsTimers(); // pause the JS timers |
145 m_webView.setScrolling(true); |
148 m_webView.setScrolling(true); |
146 m_startPos = scrollingView->contentPos(); |
149 m_startPos = scrollingView->contentPos(); |
147 m_lastPos = m_startPos; |
150 m_lastPos = m_startPos; |
148 m_decelTimer->Start(0, KScrollIntervalTimeout, |
151 m_decelTimer->Start(0, KScrollIntervalTimeout, |
149 TCallBack(&decelTimerCB, this)); |
152 TCallBack(&decelTimerCB, this)); |
191 (m_numscrollsteps > 1 && !scrollingView->needScroll(pos) && |
194 (m_numscrollsteps > 1 && !scrollingView->needScroll(pos) && |
192 !handler->currentScrollingElement())) { |
195 !handler->currentScrollingElement())) { |
193 if (m_scrollbarDrawer) { |
196 if (m_scrollbarDrawer) { |
194 m_scrollbarDrawer->fadeScrollbar(); |
197 m_scrollbarDrawer->fadeScrollbar(); |
195 } |
198 } |
|
199 |
|
200 m_webView.resumeJsTimers(); // resume the js timers |
196 m_webView.setScrolling(false); |
201 m_webView.setScrolling(false); |
197 m_decelTimer->Cancel(); |
202 m_decelTimer->Cancel(); |
198 handler->clearScrollingElement(); |
203 handler->clearScrollingElement(); |
199 m_webView.setViewIsScrolling(false); |
204 m_webView.setViewIsScrolling(false); |
200 m_webView.toggleRepaintTimer(true); |
205 m_webView.toggleRepaintTimer(true); |