Changeset 91183 in webkit
- Timestamp:
- Jul 18, 2011 6:43:55 AM (13 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r91182 r91183 1 2011-07-15 Jocelyn Turcotte <jocelyn.turcotte@nokia.com> 2 3 [Qt] Consider QTouchWebPage's transform when scrolling the viewport. 4 https://bugs.webkit.org/show_bug.cgi?id=64541 5 6 Reviewed by Benjamin Poulain. 7 8 Currently the scroll deltas are given to moveBy in page coordinates 9 which doesn't match when the page view is scalled. 10 This patch gives the scroll delta to the viewport in it's own coordinates. 11 12 * UIProcess/qt/TouchViewInterface.cpp: 13 (WebKit::TouchViewInterface::panGestureRequestScroll): 14 1 15 2011-07-15 Jocelyn Turcotte <jocelyn.turcotte@nokia.com> 2 16 -
trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.cpp
r91182 r91183 46 46 void TouchViewInterface::panGestureRequestScroll(qreal deltaX, qreal deltaY) 47 47 { 48 m_viewportView->d->scroll(deltaX, deltaY); 48 // Translate the delta from page to viewport coordinates. 49 QPointF destInViewportCoords = m_viewportView->mapFromItem(m_pageView, m_pageView->mapFromParent(m_pageView->pos()) + QPointF(deltaX, deltaY)); 50 QPointF offsetInViewportCoords = destInViewportCoords - m_viewportView->mapFromItem(m_pageView->parentItem(), m_pageView->pos()); 51 m_viewportView->d->scroll(offsetInViewportCoords.x(), offsetInViewportCoords.y()); 49 52 } 50 53
Note: See TracChangeset
for help on using the changeset viewer.