diff --git a/applications/imageviewer/package/contents/ui/FullScreenDelegate.qml b/applications/imageviewer/package/contents/ui/FullScreenDelegate.qml index fd5fced..cf32a30 100644 --- a/applications/imageviewer/package/contents/ui/FullScreenDelegate.qml +++ b/applications/imageviewer/package/contents/ui/FullScreenDelegate.qml @@ -21,7 +21,7 @@ import QtQuick 1.0 import org.kde.plasma.core 0.1 as PlasmaCore import org.kde.plasma.mobilecomponents 0.1 as MobileComponents import org.kde.qtextracomponents 0.1 -import Qt.labs.gestures 1.0 +import Qt.labs.gestures 2.0 Flickable { id: mainFlickable @@ -39,9 +39,12 @@ Flickable { clip: true GestureArea { anchors.fill: parent - onPinch: { - mainImage.scale = scaleFactor + Pinch { + onUpdated: { + mainImage.scale *= gesture.scaleFactor + } } + } Image { id: mainImage @@ -54,6 +57,6 @@ Flickable { } } } - } + } } diff --git a/applications/webbrowser/package/contents/code/content/FlickableWebView.qml b/applications/webbrowser/package/contents/code/content/FlickableWebView.qml index 81cbc88..cf46539 100644 --- a/applications/webbrowser/package/contents/ui/content/FlickableWebView.qml +++ b/applications/webbrowser/package/contents/ui/content/FlickableWebView.qml @@ -61,6 +61,8 @@ Flickable { anchors.left: parent.left anchors.right: parent.right pressDelay: 200 + property Item view: webView + onWidthChanged : { // Expand (but not above 1:1) if otherwise would be smaller that available width. diff --git a/applications/webbrowser/package/contents/code/webbrowser.qml b/applications/webbrowser/package/contents/code/webbrowser.qml index e3b7984..c0731aa 100644 --- a/applications/webbrowser/package/contents/code/webbrowser.qml +++ b/applications/webbrowser/package/contents/ui/webbrowser.qml @@ -43,7 +43,7 @@ import QtQuick 1.0 import QtWebKit 1.0 import org.kde.plasma.core 0.1 as PlasmaCore import org.kde.plasma.mobilecomponents 0.1 as MobileComponents -import Qt.labs.gestures 1.0 +import Qt.labs.gestures 2.0 import "content" @@ -72,6 +72,23 @@ Rectangle { uri: webBrowser.url } + //FIXME: for Qt 4.8 this api will change + GestureArea { + anchors.fill: webView + Pinch { + onStarted: { + webView.view.renderingEnabled = false + } + onUpdated: { + webView.view.contentsScale *= gesture.scaleFactor + } + onFinished: { + webView.view.renderingEnabled = true + } + } + } + + FlickableWebView { id: webView objectName: "webView" @@ -86,14 +103,6 @@ Rectangle { } } - //FIXME: for Qt 4.8 this api will change - GestureArea { - anchors.fill: webView - onPinch: { - webView.doZoom(scaleFactor, centerPoint.x, centerPoint.y) - } - } - Item { id: headerSpace; width: parent.width; height: header.height } Header {