diff options
Diffstat (limited to 'demos/declarative/webbrowser/webbrowser.qml')
| -rw-r--r-- | demos/declarative/webbrowser/webbrowser.qml | 133 |
1 files changed, 68 insertions, 65 deletions
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml index 278bc43..4c4ad7c 100644 --- a/demos/declarative/webbrowser/webbrowser.qml +++ b/demos/declarative/webbrowser/webbrowser.qml @@ -13,21 +13,6 @@ Item { width: 640 height: 480 - Script { - function zoomOut() { - WebBrowser.state = "ZoomedOut"; - } - function toggleZoom(x,y) { - if(WebBrowser.state == "ZoomedOut") { - Flick.centerX = x - Flick.centerY = y - WebBrowser.state = "Normal"; - } else { - zoomOut(); - } - } - } - Item { id: WebPanel anchors.fill: parent @@ -183,9 +168,6 @@ Item { anchors.left: parent.left anchors.right: parent.right - property real centerX : 0 - property real centerY : 0 - WebView { id: MyWebView pixelCacheSize: 4000000 @@ -208,18 +190,81 @@ Item { } url: fixUrl(WebBrowser.urlString) - smooth: !Flick.moving + smooth: false fillColor: "white" focus: true preferredWidth: Flick.width - preferredHeight: Flick.height/scale - scale: (width > 0) ? Flick.width/width*zoomedOut+(1-zoomedOut) : 1 + webPageWidth: 980 onUrlChanged: { if (url != null) { WebBrowser.urlString = url.toString(); } } - onDoubleClick: { toggleZoom(clickX,clickY) } + onDoubleClick: { heuristicZoom(clickX,clickY) } + + SequentialAnimation { + id: QuickZoom - property real zoomedOut : 1 + PropertyAction { + target: MyWebView + property: "renderingEnabled" + value: false + } + ParallelAnimation { + NumberAnimation { + id: ScaleAnim + target: MyWebView + property: "scale" + from: 1 + to: 0 // set before calling + easing: "easeInOutQuad" + duration: 200 + } + NumberAnimation { + id: FlickVX + target: Flick + property: "viewportX" + easing: "easeInOutQuad" + duration: 200 + from: 0 // set before calling + to: 0 // set before calling + } + NumberAnimation { + id: FlickVY + target: Flick + property: "viewportY" + easing: "easeInOutQuad" + duration: 200 + from: 0 // set before calling + to: 0 // set before calling + } + } + PropertyAction { + target: MyWebView + property: "scale" + value: 1.0 + } + PropertyAction { + id: FinalZoom + target: MyWebView + property: "zoomFactor" + } + PropertyAction { + target: MyWebView + property: "renderingEnabled" + value: true + } + } + onZooming: { + if (centerX) { + sc = zoom/zoomFactor; + ScaleAnim.to = sc; + FlickVX.from = Flick.viewportX + FlickVX.to = Math.min(Math.max(0,centerX-Flick.width/2),MyWebView.width*sc-Flick.width) + FlickVY.from = Flick.viewportY + FlickVY.to = Math.min(Math.max(0,centerY-Flick.height/2),MyWebView.height*sc-Flick.height) + FinalZoom.value = zoom + QuickZoom.start() + } + } } Rectangle { id: WebViewTint @@ -347,46 +392,4 @@ Item { } } } - states: [ - State { - name: "Normal" - PropertyChanges { target: MyWebView; zoomedOut: 0 } - PropertyChanges { target: Flick; explicit: true; viewportX: Math.min(MyWebView.width-Flick.width,Math.max(0,Flick.centerX-Flick.width/2)) } - PropertyChanges { target: Flick; explicit: true; viewportY: Math.min(MyWebView.height-Flick.height,Math.max(0,Flick.centerY-Flick.height/2)) } - }, - State { - name: "ZoomedOut" - PropertyChanges { target: MyWebView; zoomedOut: 1 } - } - ] - transitions: [ - Transition { - SequentialAnimation { - PropertyAction { - target: MyWebView - property: "smooth" - value: false - } - ParallelAnimation { - NumberAnimation { - target: MyWebView - properties: "zoomedOut" - easing: "easeInOutQuad" - duration: 200 - } - NumberAnimation { - target: Flick - properties: "viewportX,viewportY" - easing: "easeInOutQuad" - duration: 200 - } - } - PropertyAction { - target: MyWebView - property: "smooth" - value: !Flick.moving - } - } - } - ] } |