equal
deleted
inserted
replaced
402 } |
402 } |
403 |
403 |
404 |
404 |
405 if (shouldScrollVertically || shouldScrollHorizontally){ |
405 if (shouldScrollVertically || shouldScrollHorizontally){ |
406 if (m_scrollableView.m_frameView->needScroll(scrollPos)) { |
406 if (m_scrollableView.m_frameView->needScroll(scrollPos)) { |
407 frame->frameView()->scrollTo(scrollPos); |
407 frame->frameView()->scrollTo(scrollPos, ETrue); |
408 updateScrollbars(scrollPos, newscrollDelta); |
408 updateScrollbars(scrollPos, newscrollDelta); |
409 core(frame)->sendScrollEvent(); |
409 core(frame)->sendScrollEvent(); |
410 } |
410 } |
411 } |
411 } |
412 else { |
412 else { |
429 m_lastPosition = m_currentPosition; |
429 m_lastPosition = m_currentPosition; |
430 m_currentNormalizedPosition.iX = m_scrollableView.contentPos().iX * 100; |
430 m_currentNormalizedPosition.iX = m_scrollableView.contentPos().iX * 100; |
431 m_currentNormalizedPosition.iY = m_scrollableView.contentPos().iY * 100; |
431 m_currentNormalizedPosition.iY = m_scrollableView.contentPos().iY * 100; |
432 } |
432 } |
433 else { |
433 else { |
434 |
434 |
435 m_scrollableView.m_frameView->scrollTo(scrollPos); |
435 m_scrollableView.m_frameView->scrollTo(scrollPos, ETrue); |
436 m_lastPosition = m_currentPosition; |
436 m_lastPosition = m_currentPosition; |
437 #ifndef BRDO_USE_GESTURE_HELPER |
437 #ifndef BRDO_USE_GESTURE_HELPER |
438 m_decel->updatePos(); |
438 m_decel->updatePos(); |
439 #endif |
439 #endif |
440 // update scroll bars |
440 // update scroll bars |