diff options
author | Damian Jansen <damian.jansen@nokia.com> | 2011-05-06 13:50:37 +1000 |
---|---|---|
committer | Damian Jansen <damian.jansen@nokia.com> | 2011-05-06 13:50:37 +1000 |
commit | 9dffdfe646f4e30d481e9f146810ae0838fb3936 (patch) | |
tree | 3f1dd89163b94b5cc965512c5e91b19e201976df /Qt | |
parent | 3fcf11b3c2f1e9bc7080fb8d8ef5562a72ce32ae (diff) |
Scale should be taken from pinch.target
Diffstat (limited to 'Qt')
-rw-r--r-- | Qt/examples/declarative/pincharea/pincharea.qml | 9 |
1 files 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 { |