diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-09-18 07:41:11 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-09-19 05:14:07 +0200 |
commit | 941eff6c1c3a2b188565e4449cf4671d87fd7645 (patch) | |
tree | b94bb0fc7a012c2e355864deafb41593d92670d5 /examples/quick/demos/photosurface/photosurface.qml | |
parent | f99573677aa0242f398bb9b0f79c35a8d0e16422 (diff) |
Fixed frame focusing on touch devices
Also fixed the \quotefromfile commands in the doc to
display the changed code correctly.
Task-number: QTBUG-38779
Change-Id: I37d37139459cb9cdee7ec9beaffeab26a1cb4aaf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Diffstat (limited to 'examples/quick/demos/photosurface/photosurface.qml')
-rw-r--r-- | examples/quick/demos/photosurface/photosurface.qml | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/examples/quick/demos/photosurface/photosurface.qml b/examples/quick/demos/photosurface/photosurface.qml index 9d081de1e3..c269018426 100644 --- a/examples/quick/demos/photosurface/photosurface.qml +++ b/examples/quick/demos/photosurface/photosurface.qml @@ -49,6 +49,7 @@ Window { color: "black" property int highestZ: 0 property real defaultSize: 200 + property var currentFrame: undefined FileDialog { id: fileDialog @@ -90,15 +91,17 @@ Window { pinch.maximumRotation: 360 pinch.minimumScale: 0.1 pinch.maximumScale: 10 - onPinchFinished: photoFrame.border.color = "black"; + onPinchStarted: setFrameColor(); MouseArea { id: dragArea hoverEnabled: true anchors.fill: parent drag.target: photoFrame - onPressed: photoFrame.z = ++root.highestZ; - onEntered: photoFrame.border.color = "red"; - onExited: photoFrame.border.color = "black"; + onPressed: { + photoFrame.z = ++root.highestZ; + parent.setFrameColor(); + } + onEntered: parent.setFrameColor(); onWheel: { if (wheel.modifiers & Qt.ControlModifier) { photoFrame.rotation += wheel.angleDelta.y / 120 * 5; @@ -115,6 +118,12 @@ Window { } } } + function setFrameColor() { + if (currentFrame) + currentFrame.border.color = "black"; + currentFrame = photoFrame; + currentFrame.border.color = "red"; + } } } } |