diff options
| author | Patrick Burke <patrick.burke@nokia.com> | 2011-11-11 14:25:42 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-16 08:07:54 +0100 |
| commit | 4c05c7fefd86be3bf80cbe173996d232ade211b6 (patch) | |
| tree | 4621f0f4ec2f6530c22868fe2f8bc57a681b5b11 | |
| parent | d6f72cd5c9dedec2896d705ffc646d8dbc1b8ffb (diff) | |
ModelTweaker: Implementing minimum-scale via mouse dragging.
Change-Id: Iaa07b8fc8409111d9dd011fbb67763d9aa28ce8b
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
| -rw-r--r-- | util/qt3d/modeltweak/qml/ModelTweak.qml | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/util/qt3d/modeltweak/qml/ModelTweak.qml b/util/qt3d/modeltweak/qml/ModelTweak.qml index dfad5fef..4dd3b83e 100644 --- a/util/qt3d/modeltweak/qml/ModelTweak.qml +++ b/util/qt3d/modeltweak/qml/ModelTweak.qml @@ -111,16 +111,16 @@ Rectangle { transformRotateZ.angle = rotateZ - (downY - mouse.y)/rotateSensitivity } function scaleMouseX(mouse) { - transformScale.scale = - Qt.vector3d(transformScale.scale.x, - transformScale.scale.y, - scaleZ - (downX - mouse.x)/scaleSensitivity) + var s = scaleZ - (downX - mouse.x)/scaleSensitivity; + if (s<0) + return; + transformScale.scale = Qt.vector3d(transformScale.scale.x, transformScale.scale.y, s) } function scaleMouseY(mouse) { - transformScale.scale = - Qt.vector3d(transformScale.scale.x, - scaleY + (downY - mouse.y)/scaleSensitivity, - transformScale.scale.z) + var s = scaleY + (downY - mouse.y)/scaleSensitivity; + if (s<0) + return; + transformScale.scale = Qt.vector3d(transformScale.scale.x, s, transformScale.scale.z) } } @@ -148,16 +148,16 @@ Rectangle { transformRotateX.angle = rotateX - (downY - mouse.y)/rotateSensitivity } function scaleMouseX(mouse) { - transformScale.scale = - Qt.vector3d(scaleX - (downX - mouse.x)/scaleSensitivity, - transformScale.scale.y, - transformScale.scale.z) + var s = scaleX - (downX - mouse.x)/scaleSensitivity + if (s<0) + return; + transformScale.scale = Qt.vector3d(s, transformScale.scale.y, transformScale.scale.z) } function scaleMouseY(mouse) { - transformScale.scale = - Qt.vector3d(transformScale.scale.x, - scaleY + (downY - mouse.y)/scaleSensitivity, - transformScale.scale.z) + var s = scaleY + (downY - mouse.y)/scaleSensitivity + if (s<0) + return; + transformScale.scale = Qt.vector3d(transformScale.scale.x, s, transformScale.scale.z) } } @@ -186,16 +186,16 @@ Rectangle { transformRotateX.angle = rotateX - (downY - mouse.y)/rotateSensitivity } function scaleMouseX(mouse) { - transformScale.scale = - Qt.vector3d(scaleX - (downX - mouse.x)/scaleSensitivity, - transformScale.scale.y, - transformScale.scale.z) + var s = scaleX - (downX - mouse.x)/scaleSensitivity; + if (s<0) + return; + transformScale.scale = Qt.vector3d(s, transformScale.scale.y, transformScale.scale.z) } function scaleMouseY(mouse) { - transformScale.scale = - Qt.vector3d(transformScale.scale.x, - transformScale.scale.y, - scaleZ + (downY - mouse.y)/scaleSensitivity) + var s = scaleZ + (downY - mouse.y)/scaleSensitivity; + if (s<0) + return; + transformScale.scale = Qt.vector3d(transformScale.scale.x, transformScale.scale.y, s) } } |