diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2016-06-23 13:28:30 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-06-28 18:18:09 +0000 |
commit | fa8cccf479610757aa7957b2062a6616e2ebc173 (patch) | |
tree | 5427a45110f396ea79e7f029d5a2706b680830c3 /src | |
parent | 97c88459d88fede84f725152ad7929bd83d08933 (diff) |
Tumbler: change default visibleItemCount to 5
This looks much better than 3; it looks more like an actual Tumbler,
partly because the displacement shading is made more visible. This
should make it less confusing to interact with for first-time users.
In addition, we were previously setting it to 5 in several places.
[ChangeLog][Important Behavior Changes][Tumbler] Changed the default
value of visibleItemCount to 5 to make it visually clearer that it's a
Tumbler.
Change-Id: I7c16e05aa73f58e3405caa1826453cb824efae11
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols2-tumbler-wrap.gif | bin | 54383 -> 158221 bytes | |||
-rw-r--r-- | src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml | 1 | ||||
-rw-r--r-- | src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml | 3 | ||||
-rw-r--r-- | src/quicktemplates2/qquicktumbler.cpp | 2 |
4 files changed, 1 insertions, 5 deletions
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-wrap.gif b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-wrap.gif Binary files differindex 4821a4e8..ff86ad00 100644 --- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-wrap.gif +++ b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-wrap.gif diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml index d2b4f960..3bd00fdd 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml @@ -32,7 +32,6 @@ import QtQuick.Controls 2.0 Tumbler { id: control model: 15 - visibleItemCount: 5 background: Item { Rectangle { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml index e62238ca..52560bfa 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml @@ -78,21 +78,18 @@ Rectangle { Tumbler { id: hoursTumbler - visibleItemCount: 5 model: 12 delegate: delegateComponent } Tumbler { id: minutesTumbler - visibleItemCount: 5 model: 60 delegate: delegateComponent } Tumbler { id: amPmTumbler - visibleItemCount: 5 wrap: false model: ["AM", "PM"] delegate: delegateComponent diff --git a/src/quicktemplates2/qquicktumbler.cpp b/src/quicktemplates2/qquicktumbler.cpp index 572f1a7e..25d456d9 100644 --- a/src/quicktemplates2/qquicktumbler.cpp +++ b/src/quicktemplates2/qquicktumbler.cpp @@ -74,7 +74,7 @@ class QQuickTumblerPrivate : public QQuickControlPrivate, public QQuickItemChang public: QQuickTumblerPrivate() : delegate(nullptr), - visibleItemCount(3), + visibleItemCount(5), wrap(true), view(nullptr), viewContentItem(nullptr), |