equal
deleted
inserted
replaced
106 |
106 |
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_decelTimer->Cancel(); |
112 m_decelTimer->Cancel(); |
112 } |
113 } |
113 } |
114 } |
114 |
115 |
115 void WebScrollingDeceleratorGH::startDecel(TRealPoint& speed, WebScrollbarDrawer* scrollbarDrawer) |
116 void WebScrollingDeceleratorGH::startDecel(TRealPoint& speed, WebScrollbarDrawer* scrollbarDrawer) |
133 m_initSpeed.iX = (-1) * speedX; |
134 m_initSpeed.iX = (-1) * speedX; |
134 m_initSpeed.iY = (-1) * speedY; |
135 m_initSpeed.iY = (-1) * speedY; |
135 |
136 |
136 m_numscrollsteps = 0; |
137 m_numscrollsteps = 0; |
137 if (m_decelTimer->IsActive()) { |
138 if (m_decelTimer->IsActive()) { |
|
139 m_webView.setScrolling(false); |
138 m_decelTimer->Cancel(); |
140 m_decelTimer->Cancel(); |
139 } |
141 } |
140 |
142 |
141 WebFrameView* scrollingView = m_webView.pageScrollHandler()->currentScrollingFrameView(); |
143 WebFrameView* scrollingView = m_webView.pageScrollHandler()->currentScrollingFrameView(); |
142 if (scrollingView) { |
144 if (scrollingView) { |
|
145 m_webView.setScrolling(true); |
143 m_startPos = scrollingView->contentPos(); |
146 m_startPos = scrollingView->contentPos(); |
144 m_lastPos = m_startPos; |
147 m_lastPos = m_startPos; |
145 m_decelTimer->Start(0, KScrollIntervalTimeout, |
148 m_decelTimer->Start(0, KScrollIntervalTimeout, |
146 TCallBack(&decelTimerCB, this)); |
149 TCallBack(&decelTimerCB, this)); |
147 } |
150 } |
188 (m_numscrollsteps > 1 && !scrollingView->needScroll(pos) && |
191 (m_numscrollsteps > 1 && !scrollingView->needScroll(pos) && |
189 !handler->currentScrollingElement())) { |
192 !handler->currentScrollingElement())) { |
190 if (m_scrollbarDrawer) { |
193 if (m_scrollbarDrawer) { |
191 m_scrollbarDrawer->fadeScrollbar(); |
194 m_scrollbarDrawer->fadeScrollbar(); |
192 } |
195 } |
|
196 m_webView.setScrolling(false); |
193 m_decelTimer->Cancel(); |
197 m_decelTimer->Cancel(); |
194 handler->clearScrollingElement(); |
198 handler->clearScrollingElement(); |
195 m_webView.setViewIsScrolling(false); |
199 m_webView.setViewIsScrolling(false); |
196 m_webView.toggleRepaintTimer(true); |
200 m_webView.toggleRepaintTimer(true); |
197 } |
201 } |