From 9dffdfe646f4e30d481e9f146810ae0838fb3936 Mon Sep 17 00:00:00 2001 From: Damian Jansen Date: Fri, 6 May 2011 13:50:37 +1000 Subject: Scale should be taken from pinch.target --- Qt/examples/declarative/pincharea/pincharea.qml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Qt/examples/declarative/pincharea/pincharea.qml b/Qt/examples/declarative/pincharea/pincharea.qml index 2324ace..2383851 100644 --- a/Qt/examples/declarative/pincharea/pincharea.qml +++ b/Qt/examples/declarative/pincharea/pincharea.qml @@ -47,13 +47,14 @@ Rectangle { Rectangle { color: "transparent"; border.color: "black"; x: 150; y: 150; height: 250; width: 250 } PinchArea { + id: pinchy property int xpoint property int ypoint - property int pinchscale + property real pinchscale property int pinchrotation - id: pinchy - enabled: false pinch.target: logo + pinchscale: pinch.target.scale + enabled: false anchors.fill: parent pinch.dragAxis: Pinch.XandYAxis pinch.minimumScale: 0.5 @@ -64,7 +65,7 @@ Rectangle { pinch.maximumY: 300 pinch.minimumRotation: -150 pinch.maximumRotation: 150 - onPinchUpdated: { xpoint = pinch.center.x; ypoint = pinch.center.y; pinchrotation = pinch.rotation; pinchscale = pinch.scale } + onPinchUpdated: { xpoint = pinch.center.x; ypoint = pinch.center.y; pinchrotation = pinch.rotation; pinchscale = pinch.target.scale } } Rectangle { -- cgit v1.2.3