summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Burke <patrick.burke@nokia.com>2011-11-11 15:20:26 +1000
committerQt by Nokia <qt-info@nokia.com>2011-11-16 08:08:19 +0100
commit066458d1107674a9b5e87760c7ac63029020b5e5 (patch)
treec9bf38de5e68a2554f112abbf0ab6815479f1a19
parent4c05c7fefd86be3bf80cbe173996d232ade211b6 (diff)
ModelTweaker: Maximise/restore button on viewports.
Change-Id: I4d8f63b080b93c710ea40830679ed34ad48f34a2 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
-rw-r--r--util/qt3d/modeltweak/qml/Grow.pngbin0 -> 256 bytes
-rw-r--r--util/qt3d/modeltweak/qml/ModelTweak.qml18
-rw-r--r--util/qt3d/modeltweak/qml/ModelViewport.qml15
-rw-r--r--util/qt3d/modeltweak/qml/Shrink.pngbin0 -> 253 bytes
4 files changed, 25 insertions, 8 deletions
diff --git a/util/qt3d/modeltweak/qml/Grow.png b/util/qt3d/modeltweak/qml/Grow.png
new file mode 100644
index 00000000..d928ee3d
--- /dev/null
+++ b/util/qt3d/modeltweak/qml/Grow.png
Binary files differ
diff --git a/util/qt3d/modeltweak/qml/ModelTweak.qml b/util/qt3d/modeltweak/qml/ModelTweak.qml
index 4dd3b83e..abc0d5b4 100644
--- a/util/qt3d/modeltweak/qml/ModelTweak.qml
+++ b/util/qt3d/modeltweak/qml/ModelTweak.qml
@@ -88,8 +88,10 @@ Rectangle {
}
ModelViewport {
- x: 0;
- y: 0;
+ id: mvpZY
+ visible: !mvpXY.isBig && !mvpXZ.isBig ? true : false
+ x: isBig ? 0 : 0;
+ y: isBig ? 0 : 0;
camera.eye: Qt.vector3d(10, 0, 0);
function translateMouseX(mouse) {
@@ -125,8 +127,10 @@ Rectangle {
}
ModelViewport {
- x: parent.width/2
- y: 0;
+ id: mvpXY
+ visible: !mvpZY.isBig && !mvpXZ.isBig ? true : false
+ x: isBig ? 0 : parent.width/2
+ y: isBig ? 0 : 0;
camera.eye: Qt.vector3d(0, 0, 10);
function translateMouseX(mouse) {
@@ -162,8 +166,10 @@ Rectangle {
}
ModelViewport {
- x: parent.width/2;
- y: parent.height/2;
+ id: mvpXZ
+ visible: !mvpZY.isBig && !mvpXY.isBig ? true : false
+ x: isBig ? 0 : parent.width/2;
+ y: isBig ? 0 : parent.height/2;
camera.eye: Qt.vector3d(0, 10, 0);
camera.upVector: Qt.vector3d(0, 0, -1);
diff --git a/util/qt3d/modeltweak/qml/ModelViewport.qml b/util/qt3d/modeltweak/qml/ModelViewport.qml
index 2dc2d31e..66a30bd1 100644
--- a/util/qt3d/modeltweak/qml/ModelViewport.qml
+++ b/util/qt3d/modeltweak/qml/ModelViewport.qml
@@ -2,11 +2,13 @@ import QtQuick 1.0
import Qt3D 1.0
Rectangle {
- width: parent.width/2;
- height: parent.height/2
+ width: isBig ? parent.width : parent.width/2;
+ height: isBig ? parent.height : parent.height/2
color: parent.color
border.color: parent.border.color
+ property bool isBig: false;
+
property alias itemPosition: mainItem.position;
property alias itemScale: mainItem.scale;
property alias camera: viewport.camera
@@ -121,4 +123,13 @@ Rectangle {
// clear the current mouse button upon release
onReleased: { mouseDown = Qt.NoButton }
}
+ Image {
+ anchors.top: parent.top
+ anchors.right: parent.right
+ source: parent.isBig ? "Shrink.png" : "Grow.png"
+ MouseArea {
+ anchors.fill: parent
+ onClicked: isBig = !isBig
+ }
+ }
}
diff --git a/util/qt3d/modeltweak/qml/Shrink.png b/util/qt3d/modeltweak/qml/Shrink.png
new file mode 100644
index 00000000..28383486
--- /dev/null
+++ b/util/qt3d/modeltweak/qml/Shrink.png
Binary files differ