diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2018-07-02 10:47:25 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-07-04 06:32:31 +0000 |
commit | 97ff7edffb23517f21b07e74283cae67c2dfca7f (patch) | |
tree | 18733be43e9cc79c787e983d888cfd92d5c6bb28 /src | |
parent | 44e4f8b360367bc846f1d9cbe55876466fea4356 (diff) |
Doc: add a section that demonstrates various contentX/contentY states
This makes it easier to visualize how the properties work.
Change-Id: I04cb1a99a1f831e5c892cb27e4a0cd127fe450e0
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/quick/doc/images/flickable-contentXY-bottom-left.png | bin | 0 -> 2780 bytes | |||
-rw-r--r-- | src/quick/doc/images/flickable-contentXY-bottom-left.svgz | bin | 0 -> 1575 bytes | |||
-rw-r--r-- | src/quick/doc/images/flickable-contentXY-bottom-right.png | bin | 0 -> 2386 bytes | |||
-rw-r--r-- | src/quick/doc/images/flickable-contentXY-bottom-right.svgz | bin | 0 -> 1580 bytes | |||
-rw-r--r-- | src/quick/doc/images/flickable-contentXY-resting.png | bin | 0 -> 430 bytes | |||
-rw-r--r-- | src/quick/doc/images/flickable-contentXY-resting.svgz | bin | 0 -> 1083 bytes | |||
-rw-r--r-- | src/quick/doc/images/flickable-contentXY-top-left.png | bin | 0 -> 3025 bytes | |||
-rw-r--r-- | src/quick/doc/images/flickable-contentXY-top-left.svgz | bin | 0 -> 1550 bytes | |||
-rw-r--r-- | src/quick/doc/images/flickable-contentXY-top-right.png | bin | 0 -> 2866 bytes | |||
-rw-r--r-- | src/quick/doc/images/flickable-contentXY-top-right.svgz | bin | 0 -> 1594 bytes | |||
-rw-r--r-- | src/quick/items/qquickflickable.cpp | 27 |
11 files changed, 26 insertions, 1 deletions
diff --git a/src/quick/doc/images/flickable-contentXY-bottom-left.png b/src/quick/doc/images/flickable-contentXY-bottom-left.png Binary files differnew file mode 100644 index 0000000000..47d3be4625 --- /dev/null +++ b/src/quick/doc/images/flickable-contentXY-bottom-left.png diff --git a/src/quick/doc/images/flickable-contentXY-bottom-left.svgz b/src/quick/doc/images/flickable-contentXY-bottom-left.svgz Binary files differnew file mode 100644 index 0000000000..db86262d74 --- /dev/null +++ b/src/quick/doc/images/flickable-contentXY-bottom-left.svgz diff --git a/src/quick/doc/images/flickable-contentXY-bottom-right.png b/src/quick/doc/images/flickable-contentXY-bottom-right.png Binary files differnew file mode 100644 index 0000000000..eb9eff24c5 --- /dev/null +++ b/src/quick/doc/images/flickable-contentXY-bottom-right.png diff --git a/src/quick/doc/images/flickable-contentXY-bottom-right.svgz b/src/quick/doc/images/flickable-contentXY-bottom-right.svgz Binary files differnew file mode 100644 index 0000000000..088c1bdf1e --- /dev/null +++ b/src/quick/doc/images/flickable-contentXY-bottom-right.svgz diff --git a/src/quick/doc/images/flickable-contentXY-resting.png b/src/quick/doc/images/flickable-contentXY-resting.png Binary files differnew file mode 100644 index 0000000000..11bde53da5 --- /dev/null +++ b/src/quick/doc/images/flickable-contentXY-resting.png diff --git a/src/quick/doc/images/flickable-contentXY-resting.svgz b/src/quick/doc/images/flickable-contentXY-resting.svgz Binary files differnew file mode 100644 index 0000000000..c8ac118048 --- /dev/null +++ b/src/quick/doc/images/flickable-contentXY-resting.svgz diff --git a/src/quick/doc/images/flickable-contentXY-top-left.png b/src/quick/doc/images/flickable-contentXY-top-left.png Binary files differnew file mode 100644 index 0000000000..de3d11d283 --- /dev/null +++ b/src/quick/doc/images/flickable-contentXY-top-left.png diff --git a/src/quick/doc/images/flickable-contentXY-top-left.svgz b/src/quick/doc/images/flickable-contentXY-top-left.svgz Binary files differnew file mode 100644 index 0000000000..bcb6476cd2 --- /dev/null +++ b/src/quick/doc/images/flickable-contentXY-top-left.svgz diff --git a/src/quick/doc/images/flickable-contentXY-top-right.png b/src/quick/doc/images/flickable-contentXY-top-right.png Binary files differnew file mode 100644 index 0000000000..7f4a16bde1 --- /dev/null +++ b/src/quick/doc/images/flickable-contentXY-top-right.png diff --git a/src/quick/doc/images/flickable-contentXY-top-right.svgz b/src/quick/doc/images/flickable-contentXY-top-right.svgz Binary files differnew file mode 100644 index 0000000000..32b721cb6b --- /dev/null +++ b/src/quick/doc/images/flickable-contentXY-top-right.svgz diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index d892e3b490..cc35630fff 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -632,6 +632,31 @@ void QQuickFlickablePrivate::updateBeginningEnd() \c contentItem that are relevant. For example, the bound of Items added to the Flickable will be available by \c contentItem.childrenRect + \section1 Examples of contentX and contentY + + The following images demonstrate a flickable being flicked in various + directions and the resulting \l contentX and \l contentY values. + The blue square represents the flickable's content, and the black + border represents the bounds of the flickable. + + \table + \row + \li \image flickable-contentXY-resting.png + \li The \c contentX and \c contentY are both \c 0. + \row + \li \image flickable-contentXY-top-left.png + \li The \c contentX and the \c contentY are both \c 50. + \row + \li \image flickable-contentXY-top-right.png + \li The \c contentX is \c -50 and the \c contentY is \c 50. + \row + \li \image flickable-contentXY-bottom-right.png + \li The \c contentX and the \c contentY are both \c -50. + \row + \li \image flickable-contentXY-bottom-left.png + \li The \c contentX is \c 50 and the \c contentY is \c -50. + \endtable + \section1 Limitations \note Due to an implementation detail, items placed inside a Flickable @@ -737,7 +762,7 @@ QQuickFlickable::~QQuickFlickable() for the position; another way is to use the normalized values in \l {QtQuick::Flickable::visibleArea}{visibleArea}. - \sa originX, originY + \sa {Examples of contentX and contentY}, originX, originY */ qreal QQuickFlickable::contentX() const { |