diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-28 20:40:22 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-29 12:45:12 +0000 |
commit | 3980354daa4d8dfa8ec07ed2c2265ebb137b6f36 (patch) | |
tree | 88d64fe36e91c0242767e1bb5b28f984f8a63882 /src/imports/controls/doc | |
parent | 8d340d7f3f28364d6b2b8fad2d4828ae761a2dad (diff) |
Revert Tumbler::displacement to position changes
This reverts commits 150d8fcc7f97e4a5d56bdcf608fa22533d807677 and
0905066bcbb967d3344d399383d0ea4b30e1d489 that broke Tumbler. The
normalized position calculation did not work in some corner cases
(eg. when the total amount of model items is just 2). Therefore,
just go back to "displacement"; and if we ever get this working
correctly, we can call it position and deprecate displacement.
Task-number: QTBUG-53061
Change-Id: Ic721f8a96c250dd5d40f881ff991fae687311996
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/doc')
-rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols2-tumbler-position.png | bin | 5150 -> 0 bytes | |||
-rw-r--r-- | src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-position.qml | 44 |
2 files changed, 0 insertions, 44 deletions
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-position.png b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-position.png Binary files differdeleted file mode 100644 index 437459a8..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-position.png +++ /dev/null diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-position.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-position.qml deleted file mode 100644 index 65263110..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-position.qml +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Frame { - Tumbler { - model: 6 - visibleItemCount: 5 - delegate: Label { - text: qsTr("%1 (%2)").arg(index).arg(Tumbler.position.toFixed(1)) - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - //! [1] - opacity: 1 - Math.abs(Tumbler.position * 0.8) - //! [1] - } - } -} |