aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/controls/data/tst_swipedelegate.qml
Commit message (Collapse)AuthorAgeFilesLines
* Update expected result of SwipeDelegate warning messagesMitch Curtis2017-03-201-1/+1
| | | | | | | | | It looks like af9536deeaf1123aaae5ce78cee7b4014a01d595 (in declarative) changed the format of warning messages. Task-number: QTBUG-59536 Change-Id: I9a8228448ef136f65258b985c3dddf011063c49c Reviewed-by: Liang Qi <liang.qi@qt.io>
* Revert "Temporarily comment out line number-dependent SwipeDelegate tests"Mitch Curtis2017-03-201-104/+103
| | | | | | | | | | This reverts commit 6a5e030fbfa5f2adeabc6284f6ae3993e3d658c7. The qt5.git integration went through, so this can be reverted now to make way for a proper fix. Change-Id: I73f9aef29683172360e85026e1c8c93b8409eeae Reviewed-by: Liang Qi <liang.qi@qt.io>
* Temporarily comment out line number-dependent SwipeDelegate testsMitch Curtis2017-03-171-103/+104
| | | | | | | | | This is needed in order for af9536deeaf1123aaae5ce78cee7b4014a01d595 to be integrated into qt5.git. Task-number: QTBUG-59536 Change-Id: Ie1405a498018473029ce34de7dd95189aa75f203 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update license headers to silence qtqa/tst_license warningsJ-P Nurmi2017-02-241-17/+27
| | | | | | | | | | Sync with the qtbase/header.XXX. The license headers were matching qtbase/header.XXX-OLD, which makes qtqa/tst_license flood warnings: Old license being used for foo.qdoc Change-Id: I199bf303a2d648e0d5f7bc01cb0814a5f945eeff Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* tst_control: fix TestCase::mouseMove() usageJ-P Nurmi2017-01-121-22/+22
| | | | | | | | | TestCase::mouseMove() does not take a mouse button argument. What we intended to pass as a button argument, was actually used as a 1ms delay (the value of Qt.LeftButton is 1). Change-Id: I5e6e6b05a521702e99418cceba2d0a7cdbc68109 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2017-01-111-1/+1
|\ | | | | | | Change-Id: If797ac58344b20e8de4379343131c097247ba2f2
| * Welcome to 2017J-P Nurmi2017-01-091-1/+1
| | | | | | | | | | Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | SwipeDelegate: rename swipe.rebound to swipe.transitionJ-P Nurmi2016-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "rebound" name originates from Flickable::rebound, but for swipe delegate the transition is not only applied on release, but also when calling swipe.open() or swipe.close(). Therefore the "rebound" name feels a bit off in this context. Furthermore, this patch adds the missing docs and a changelog entry. [ChangeLog][Controls][SwipeDelegate] Added a swipe.transition property that holds the transition that is applied when a swipe is released, or swipe.open() or swipe.close() is called. Change-Id: Ic38ec850c64dd21b8d9deb08609172c6cb0f6d71 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | tst_swipedelegate: use TestCase's new createTemporaryObject functionsMitch Curtis2016-12-191-77/+32
| | | | | | | | | | | | | | | | This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Iebec81dd54a8f6b0bde8a3ce10f99322d012cae1 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | tst_swipedelegate: use more reliable swipe.closed()J-P Nurmi2016-12-141-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Interactive SwipeDelegate auto tests wait for animations to finish, before they continue sending next mouse events, because sending mouse events while a transition is running would lead to unexpected results. (Fuzzy) comparing swipe.position is no longer a reliable way to test that the delegate has been fully opened or closed. Since the value is animated smoothly and updates frequently during the transition, fuzzy compare often succeeds right before the transition finishes. Change-Id: Id83cac6bc3b3ba4e2c34ab15837e033d1ffb1c1e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | SwipeDelegate: add swipe.opened() and swipe.closed() signalsJ-P Nurmi2016-12-141-0/+32
| | | | | | | | | | | | | | | | Emitted when the delegate has been opened or closed by swipe, _and_ the respective transition has finished. Change-Id: I8a242e24352d311fd8b41ceafd0a36619eff73f2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | SwipeDelegate: transition swipe.positionJ-P Nurmi2016-12-141-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the value of swipe.position jumped on mouse/touch release, or when open() or close() was called. Transitioning the swipe.position value smoothly to the target value makes it possible to use it as opacity/scale/etc. for the side items. Notice that this is backwards compatible with the old behavior. If no transition is set, the value jumps the same way it did before. In that case, Behavior on x makes the movement smooth. Task-number: QTBUG-57242 Change-Id: Id9c06b5b08fa73f2f575787e16dc6e20e4ccb545 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-12-011-0/+49
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/SpinBox.qml src/imports/controls/material/SpinBox.qml src/imports/controls/universal/SpinBox.qml tests/auto/controls/data/tst_swipedelegate.qml Change-Id: Ie1d1f487890f0a9f80a00df5e813e1d2e8303fe5
| * Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-12-011-0/+49
| |\ | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/controls/data/tst_swipedelegate.qml Change-Id: I15bd0366f1ad0ce35f1dce6d790da6dd5f0221f9
| | * SwipeDelegate: fix animations when releasing from a drag5.7Mitch Curtis2016-11-301-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9812a9c changed the order in which the pressed and position state is set. Before, when releasing after swiping, it would be: set pressed to false => set position After 9812a9c, it became: set position => set pressed to false The original order is necessary to ensure that animations can rely on being enabled *before* position changes, as their enabled expression typically looks something like this: enabled: !control.down This patch duplicates the contents of QQuickAbstractButton::mouseUngrabEvent() for now, with a TODO comment to ensure that it's moved into a private helper that we can call later on. Task-number: QTBUG-57350 Change-Id: I31af7a665fb2d0e37548df31560ed7bbb0c3cadb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Add SwipeDelegate::swipe.open()J-P Nurmi2016-11-251-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows nice tricks, such as opening the swipe on click to expose more details for clicked delegates. [ChangeLog][Controls][SwipeDelegate] Added swipe.open(side) method that can be used to programmatically open the side item on the specified side, which can be either SwipeDelegate.Left or SwipeDelegate.Right. Change-Id: I64000e41ef62e04bf11a3819e03353c3ae4690cb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | SwipeDelegate: Add swipe.enabled propertyMitch Curtis2016-11-251-0/+83
|/ / | | | | | | | | | | | | | | | | [ChangeLog][Controls][SwipeDelegate] Added swipe.enabled property to allow disabling of swiping. Task-number: QTBUG-57192 Change-Id: I733336690368ea3fb56a144a335a37e60a02f1b9 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | SwipeDelegate: fix swipes that begin over a child item of a delegateMitch Curtis2016-11-241-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | If the mouse was pressed over a child item of the delegate, the event's position will be for that item, rather than the entire control. To fix this, we need to set the correct pressPoint. To avoid duplicating QQuickAbstractButton::mousePressEvent()'s code, we simply set the correct pressPoint after calling it in QQuickSwipeDelegatePrivate::handleMousePressEvent(). Task-number: QTBUG-57271 Change-Id: I7204d6176c755512eeeb0b1a57a920fbab40392c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-11-231-3/+43
|\| | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickswipedelegate_p.h Change-Id: I5446503c1e4f21cb37f4fffeb3453d1c84b54b30
| * SwipeDelegate: don't emit clicked when released outsideMitch Curtis2016-11-231-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there are no delegates and hence the mouse hasn't been grabbed, we should clear the pressed state when the mouse is dragged outside the control. We can do so by falling back to the event handling of the base class (QQuickItemDelegate) when we have no delegates. This also ensures that the canceled() signal is emitted. A similar thing is done for controls with delegates, except that only the vertical position of the mouse is checked, as we still want to initiate swipes horizontally. Change-Id: I7738f5b9e8e8b6ce4a733008fa4ff73596e854ea Task-number: QTBUG-56312 Task-number: QTBUG-57285 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | SwipeDelegate: fix broken swiping after calling SwipeDelegate.close()Mitch Curtis2016-11-221-3/+13
| | | | | | | | | | | | | | | | | | Reset the internal state when close() is called to ensure that it's consistent. Task-number: QTBUG-57243 Change-Id: Id52724e0eb296c3f8a4fc0a0587a04558b1d1ab6 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | tst_swipedelegate: kill the unnecessary dependency to QtQuick.LayoutsJ-P Nurmi2016-11-081-6/+6
| | | | | | | | | | | | | | This fixes tst_swipedelegate to pass in static Qt builds. Change-Id: I5377e607c719650abdb256295a3076b1caf4fff5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-10-251-4/+4
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/doc/src/qtquickcontrols2-material.qdoc src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc src/imports/controls/material/ComboBox.qml Change-Id: I2a57070f96691cb6bbdaae460fbc60a85be435de
| * Fix tst_swipedelegateJ-P Nurmi2016-10-241-4/+4
| | | | | | | | | | | | | | | | These tests did not pass on my Chromebook Pixel 2. The value of Qt.styleHints.startDragDistance is 19. Change-Id: I8843803608fc4c8ca2f2c42790d648eb17c141fd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-10-071-100/+100
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-disabled.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-normal.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-checked.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-disabled.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-focused.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-normal.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-disabled.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-first-handle-focused.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-normal.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle-focused.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-disabled.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-focused.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-normal.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar-explicit.qml src/quicktemplates2/qquickmenu.cpp tests/auto/controls/data/tst_buttongroup.qml tests/auto/controls/data/tst_swipedelegate.qml Change-Id: Ib6042a0ad716f557927e7412d17ea8957d06c015
| * Move line number-dependent tests to the top of tst_swipedelegate.qmlMitch Curtis2016-10-041-100/+100
| | | | | | | | | | | | | | | | | | We should try to limit the amount of changes that happen above these functions, so that the tests don't keep failing due to line numbers changing. Change-Id: If74ac88bfca99a343f8ddbb31374578b5e977012 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-031-0/+81
|\| | | | | | | | | | | | | | | | | | | | | | | Also update expected line numbers in tst_swipedelegate. Conflicts: .qmake.conf src/quicktemplates2/qquicktextarea.cpp src/quicktemplates2/qquicktextarea_p.h tests/auto/controls/data/tst_swipedelegate.qml Change-Id: I36323e3a633c1c750d23014e56a7c881963a1a30
| * SwipeDelegate: warn about horizontally anchoring background/contentItemMitch Curtis2016-08-021-0/+81
| | | | | | | | | | | | | | | | | | SwipeDelegate must have control over the x positions of these items in order to move them during swipes. Task-number: QTBUG-55040 Change-Id: Ie1e91fa4705cffe7573205279feff9bab048acd5 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-07-151-0/+42
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickswipedelegate.cpp tests/auto/controls/data/tst_swipedelegate.qml tests/auto/controls/data/tst_textarea.qml tests/auto/controls/data/tst_textfield.qml Change-Id: I244f4ead4d14238c41db0bd965d7a2938f2ea8fc
| * SwipeDelegate: vertically resize contentItem when swipe is completeMitch Curtis2016-07-151-0/+24
| | | | | | | | | | | | | | | | Otherwise the delegate's text doesn't change with height animations. Task-number: QTBUG-54780 Change-Id: I4e253b807e4765732a80100fca102b6650527948 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * SwipeDelegate: reposition contentItem, background on width changesMitch Curtis2016-07-121-0/+18
| | | | | | | | | | | | Change-Id: I6af4f1a4517e79f2e34b0bbca401b0eefd0c6ff4 Task-number: QTBUG-54660 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | SwipeDelegate: test pressAndHold()Mitch Curtis2016-07-141-1/+21
| | | | | | | | | | Change-Id: I5035b7e54ee560f0851a1eefc5212fb3f0084a34 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | SwipeDelegate: add swipe.pressed and swipe.clicked()Mitch Curtis2016-07-141-12/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | These allow users to detect when non-interactive left/right/behind items are being pressed and clicked. [ChangeLog][SwipeDelegate] Added swipe.pressed and swipe.clicked() for detecting when non-interactive left/right/behind items are pressed and clicked. Change-Id: I858f0a8e4f85b3f80f93eb4f1680d8e121acdd41 Task-number: QTBUG-54651 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | SwipeDelegate: add swipe.completed() signalMitch Curtis2016-07-131-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | This allows users to respond to completion of the swipe by e.g. removing the item from the list it is in. [ChangeLog][SwipeDelegate] Added swipe.completed() for responding to completion of swipes. Change-Id: I3d605f18a1aff8892a6e088188b606a630e99506 Task-number: QTBUG-54651 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | SwipeDelegate: add swipe.close()Mitch Curtis2016-07-131-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | This allows users to close the swipe after an action has been triggered, for example. [ChangeLog][SwipeDelegate] Added swipe.close() for setting swipe.position to 0. Change-Id: Ib12a6592ac1ba46baafd88a41ea8f297599c7bbc Task-number: QTBUG-54651 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-07-091-0/+24
|\| | | | | | | Change-Id: Ifff470774347041d1638fb1da277a8cc11a00db6
| * SwipeDelegate: only consume child events if we grabbed the mouseMitch Curtis2016-07-081-0/+24
| | | | | | | | | | | | Change-Id: Ie808d06824e3bbdb36111625fbb5c59ee9d4e2a4 Task-number: QTBUG-54648 Reviewed-by: J-P Nurmi <jpnurmi@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>
* SwipeDelegate: rename exposure to swipe, active to completeMitch Curtis2016-05-231-204/+204
| | | | | | | | | "swipe" is both shorter and easier to understand. "complete" is easier to understand. Task-number: QTBUG-53519 Change-Id: I87ecba4ac878f033111ee56fa618b80b227858a7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* import Qt.labs.controls 1.0 => QtQuick.Controls 2.0J-P Nurmi2016-04-211-1/+1
| | | | | | | | | 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>
* Rename ControlSpy to SignalSequenceSpyJ-P Nurmi2016-04-141-29/+29
| | | | | | | | The purpose of this type is to spy a sequence of signals. Change-Id: I4d4712e5ae3b9ec0cf292a75f86b3d8598ea89f6 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Revert "tst_swipedelegate: blacklist test_swipeVelocity on OSX"Mitch Curtis2016-03-311-0/+2
| | | | | | | | | | | | This reverts commit faa65aebb2e52cc809248f6cbb86b994ff329285. It's not just OS X that fails, and tst_styles doesn't have a blacklist, so the test still causes integration failures for the material and universal styles. Rather than maintain two blacklist files, we'll just go back to skip(). Change-Id: Idcd460f5e90b205bc40367e48406b1b05b96d7fc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* tst_swipedelegate: blacklist test_swipeVelocity on OSXJ-P Nurmi2016-03-221-2/+0
| | | | | | | | This way the tests are run at least on other platforms. Change-Id: Ibceb60e8069e74a93ee2e5de5c24711e01a91cba Task-number: QTBUG-52003 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add QQuickVelocityCalculatorMitch Curtis2016-03-211-0/+74
| | | | | | | | This can be used by classes like QQuickDrawer and QQuickSwipeDelegate to handle calculation of flick velocity. Change-Id: I783c5fccad8509a8ea0ad4559f3f8b0c47b7a9a2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add SwipeDelegateMitch Curtis2016-03-151-0/+815
SwipeDelegate presents a view item that can be swiped left or right to expose more options or information. It is used as a delegate in views such as ListView. Change-Id: I7533a2b223f652993b6cee730930ea6dc125c869 Task-number: QTBUG-51610 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 20:35:40 +0000