From a878703f1652ba6e541b81cb19d5a7d3e842aadc Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Mon, 8 Apr 2013 15:50:02 +0200 Subject: [Qt][WK2] WebView's interactive property is not fully respected https://bugs.webkit.org/show_bug.cgi?id=113066 https://trac.webkit.org/r147909 Reviewed by Jocelyn Turcotte. WK2 sign-off by Benjamin Poulain. The QML WebView inherits the "interactive" property from Flickable which is true by default, and disables the interaction with the Flickable if set to false. Resulting from the design of the WebView panning and flicking is disabled by Flickable but to be consistent we also need to disable double-tap gestures and pinch gestures since they would trigger scale and position changes. Change-Id: I7879d7fa4bd2ccaf711dc44012905d49c9d7e8fd Reviewed-by: Jocelyn Turcotte --- Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp') diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp index 93f759f60..8176ed1cd 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp +++ b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp @@ -271,6 +271,9 @@ void QtWebPageEventHandler::handleSingleTapEvent(const QTouchEvent::TouchPoint& void QtWebPageEventHandler::handleDoubleTapEvent(const QTouchEvent::TouchPoint& point) { + if (!m_webView->isInteractive()) + return; + deactivateTapHighlight(); QTransform fromItemTransform = m_webPage->transformFromItem(); m_webPageProxy->findZoomableAreaForPoint(fromItemTransform.map(point.pos()).toPoint(), IntSize(point.rect().size().toSize())); -- cgit v1.2.1