aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material/Tumbler.qml
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-10-061-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/Dial.qml src/imports/controls/RangeSlider.qml src/imports/controls/Slider.qml src/imports/controls/Tumbler.qml src/imports/controls/material/Dial.qml src/imports/controls/material/RangeSlider.qml src/imports/controls/material/Slider.qml src/imports/controls/material/Tumbler.qml src/imports/controls/qtquickcontrols2plugin.cpp src/imports/controls/universal/Dial.qml src/imports/controls/universal/RangeSlider.qml src/imports/controls/universal/Slider.qml src/imports/controls/universal/Tumbler.qml Change-Id: I02b433e66109d90c63fcb9d0e5e304dc9375ea44
| * Update all QtQuick imports in src/imports/controlsJ-P Nurmi2016-10-041-1/+1
| | | | | | | | | | | | | | | | | | Most were importing 2.6, some 2.4, and some 2.7. Use consistently the latest available Qt Quick version 2.8. This can be easily tracked to the corresponding Qt version. Change-Id: Ic231b3cc0cb5d2d5cf806fe11c4ff3fd557d09e0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add QQuickTumbler::movingJ-P Nurmi2016-10-051-2/+2
|/ | | | | | | | | [ChangeLog][Controls][Tumbler] Added a moving-property that describes whether the tumbler is currently moving, due to the user either dragging or flicking the tumbler. Change-Id: Ic86d243cdbdfa8fcd7a7932264332c04a16e020a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Bump up all controls and templates imports to version 2.1J-P Nurmi2016-07-081-1/+1
| | | | | | | | | | | | Controls must import templates version 2.1 in order to "inherit" 1-revisioned properties, methods, and signals. So far, this has been done case by case, but it's less error prone and more clear to change them all. For example, if you ever see a source file pasted/linked somewhere, it's easy to identify the version it belongs to. Change-Id: I41609ec1a22bc05ac3e79f953a147ca42d9e0786 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Tumbler: add wrap propertyMitch Curtis2016-06-281-14/+9
| | | | | | | | | [ChangeLog][Tumbler] Added wrap property to control whether or not tumbler wraps when it reaches the top and bottom. Change-Id: I27c543d98f7bc574bc5dc882a130abe0dcc13cea Task-number: QTBUG-53587 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Material: remove qdoc markersJ-P Nurmi2016-06-081-4/+0
| | | | | | | | | | | | | The original plan was to include the default implementation (of all styles, if we could make the snippets collapsiple) in the customization docs. Since the default implementations tend to include internal types, in the end we went the other way and wrote dedicated example snippets for the customization docs. Therefore these markers no longer server a purpose, but just add unnecessary extra bytes for the QML parser to read. Change-Id: Ic511d7ce7a032429626ee75517d69d21b21412a3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Improve Tumbler's delegate opacity for all stylesMitch Curtis2016-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the fade-out effect more gradual: Before: http://i.imgur.com/gNyHh1y.png After: http://i.imgur.com/fsC17UE.png With: import QtQuick 2.6 import QtQuick.Window 2.2 import QtQuick.Controls 2.0 Window { width: 300 height: 300 visible: true Tumbler { model: 15 visibleItemCount: 5 anchors.centerIn: parent } } Change-Id: I7774b7a59eb2e6c15299325780f13afbc220a374 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Revert Tumbler::displacement to position changesJ-P Nurmi2016-04-291-1/+1
| | | | | | | | | | | | | 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>
* Tumbler: normalize position to [-1.0..1.0]J-P Nurmi2016-04-271-1/+1
| | | | | Change-Id: Id47f3b938e4d2e6ce27fadc47d4aa7437f2bc085 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Tumbler: rename displacement to positionJ-P Nurmi2016-04-271-1/+1
| | | | | Change-Id: Ifd44408b896343bdf77ea7b890360917944e2018 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* import Qt.labs.controls 1.0 => QtQuick.Controls 2.0J-P Nurmi2016-04-211-2/+2
| | | | | | | | | Docs, resources, .metainfo and plugins.qmltypes will be updated in follow up commits. Change-Id: I4438c5bfb8802bff0fa15c56431cfd288f179861 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* import Qt.labs.templates 1.0 => QtQuick.Templates 2.0J-P Nurmi2016-04-211-1/+1
| | | | | | | | | | | | | | Even though there never was such thing is QtQuick.Templates 1.0, we'll use version 2.0 to keep it in sync with QtQuick.Controls 2.0 (next step). The templates define (and in the future, revision) the API of the controls, so the two must have the same version or it will get messy. Docs and plugins.qmltypes will be updated in follow up commits. Change-Id: Idc2e76f32f348ba35eb4b1fa167c6868300aa910 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Controls: update license headersJ-P Nurmi2016-04-141-2/+2
| | | | | | | This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. Change-Id: Ib653135662bfd353a73290539995e8e5be211587 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add Material styleMitch Curtis2015-11-121-0/+82
Change-Id: I93662a53b42858a5b65154c5ede334182e738dde Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 12:52:23 +0000