demos/declarative/webbrowser/content/FlickableWebView.qml
changeset 33 3e2da88830cd
parent 30 5dc02b23752f
--- a/demos/declarative/webbrowser/content/FlickableWebView.qml	Tue Jul 06 15:10:48 2010 +0300
+++ b/demos/declarative/webbrowser/content/FlickableWebView.qml	Wed Aug 18 10:37:55 2010 +0300
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import Qt 4.7
-import org.webkit 1.0
+import QtWebKit 1.0
 
 Flickable {
     property alias title: webView.title
@@ -48,6 +48,7 @@
     property alias progress: webView.progress
     property alias url: webView.url
     property alias back: webView.back
+    property alias stop: webView.stop
     property alias reload: webView.reload
     property alias forward: webView.forward
 
@@ -89,15 +90,14 @@
         url: fixUrl(webBrowser.urlString)
         smooth: false // We don't want smooth scaling, since we only scale during (fast) transitions
         focus: true
-        zoomFactor: 1
 
         onAlert: console.log(message)
 
         function doZoom(zoom,centerX,centerY)
         {
             if (centerX) {
-                var sc = zoom/contentsScale;
-                scaleAnim.to = zoom;
+                var sc = zoom*contentsScale;
+                scaleAnim.to = sc;
                 flickVX.from = flickable.contentX
                 flickVX.to = Math.max(0,Math.min(centerX-flickable.width/2,webView.width*sc-flickable.width))
                 finalX.value = flickVX.to
@@ -113,7 +113,7 @@
 
         preferredWidth: flickable.width
         preferredHeight: flickable.height
-        contentsScale: 1/zoomFactor
+        contentsScale: 1
         onContentsSizeChanged: {
             // zoom out
             contentsScale = Math.min(1,flickable.width / contentsSize.width)