From 6f96bf2d8d91cc03aa72fd90517f90ec5804d1ca Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Tue, 21 Feb 2012 17:47:10 +1000
Subject: Doc improvements for positioners

- Fix docs that say opacity changes can trigger an add transition since
  this is no longer the case
- Be more clear about when the move transition is applied
- Be more clear about which anchors are allowed/disallowed in which positioners
- Add example to Positioner attached property

Change-Id: I78417ac5b8eba1af5587955121b7fd4e2ca21169
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
---
 doc/src/images/positioner-example.png              | Bin 0 -> 7020 bytes
 .../declarative/column/column-transitions.qml      |  58 +++++++++++++++++++++
 .../declarative/column/vertical-positioner.qml     |   1 +
 3 files changed, 59 insertions(+)
 create mode 100644 doc/src/images/positioner-example.png
 create mode 100644 doc/src/snippets/declarative/column/column-transitions.qml

(limited to 'doc')

diff --git a/doc/src/images/positioner-example.png b/doc/src/images/positioner-example.png
new file mode 100644
index 0000000000..636eeb7a13
Binary files /dev/null and b/doc/src/images/positioner-example.png differ
diff --git a/doc/src/snippets/declarative/column/column-transitions.qml b/doc/src/snippets/declarative/column/column-transitions.qml
new file mode 100644
index 0000000000..8e291b12c8
--- /dev/null
+++ b/doc/src/snippets/declarative/column/column-transitions.qml
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+//! [document]
+Column {
+    spacing: 2
+
+    Rectangle { color: "red"; width: 50; height: 50 }
+    Rectangle { id: greenRect; color: "green"; width: 20; height: 50 }
+    Rectangle { color: "blue"; width: 50; height: 20 }
+
+    move: Transition {
+        NumberAnimation { properties: "x,y"; duration: 1000 }
+    }
+
+    focus: true
+    Keys.onSpacePressed: greenRect.visible = !greenRect.visible
+}
+//! [document]
diff --git a/doc/src/snippets/declarative/column/vertical-positioner.qml b/doc/src/snippets/declarative/column/vertical-positioner.qml
index 84de7e75c2..1661c46ba8 100644
--- a/doc/src/snippets/declarative/column/vertical-positioner.qml
+++ b/doc/src/snippets/declarative/column/vertical-positioner.qml
@@ -43,6 +43,7 @@ import QtQuick 2.0
 //! [document]
 Column {
     spacing: 2
+
     Rectangle { color: "red"; width: 50; height: 50 }
     Rectangle { color: "green"; width: 20; height: 50 }
     Rectangle { color: "blue"; width: 50; height: 20 }
-- 
cgit v1.2.3