qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp

2801 lines
98 KiB
C++
Raw Normal View History

Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
/****************************************************************************
**
Updated license headers From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I04760a0801837cfc516d1c7c02d4f503f6bb70b6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-01-19 11:23:05 +00:00
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
**
** This file is part of the test suite of the Qt Toolkit.
**
Updated license headers From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I04760a0801837cfc516d1c7c02d4f503f6bb70b6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-01-19 11:23:05 +00:00
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
Change copyrights from Nokia to Digia Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-09-20 05:21:40 +00:00
** 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
Update copyright headers Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I61120571787870c0ed17066afb31779b1e6e30e9 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
2015-01-28 11:55:39 +00:00
** a written agreement between you and The Qt Company. For licensing terms
Updated license headers From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I04760a0801837cfc516d1c7c02d4f503f6bb70b6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-01-19 11:23:05 +00:00
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
Change copyrights from Nokia to Digia Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-09-20 05:21:40 +00:00
**
Updated license headers From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I04760a0801837cfc516d1c7c02d4f503f6bb70b6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-01-19 11:23:05 +00:00
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <QtTest/QtTest>
Say hello to QtQuick module This change moves the QtQuick 2 types and C++ API (including SceneGraph) to a new module (AKA library), QtQuick. 99% of this change is moving files from src/declarative to src/quick, and from tests/auto/declarative to tests/auto/qtquick2. The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to a plugin, src/imports/qtquick2, just like it's done for QtQuick 1. All tools, examples, and tests that use QtQuick C++ API have gotten "QT += quick" or "QT += quick-private" added to their .pro file. A few additional internal QtDeclarative classes had to be exported (via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the QtQuick 2 implementation. The old header locations (e.g. QtDeclarative/qquickitem.h) will still be supported for some time, but will produce compile-time warnings. (To avoid the QtQuick implementation using the compatibility headers (since QtDeclarative's includepath comes first), a few include statements were modified, e.g. from "#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".) There's a change in qtbase that automatically adds QtQuick to the module list if QtDeclarative is used. Together with the compatibility headers, this should help reduce the migration pain for existing projects. In theory, simply getting an existing QtDeclarative-based project to compile and link shouldn't require any changes for now -- but porting to the new scheme is of course recommended, and will eventually become mandatory. Task-number: QTBUG-22889 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-11-23 14:14:07 +00:00
#include <QtQuick/qquickview.h>
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
#include <QtQml/qqmlengine.h>
#include <QtQml/qqmlcomponent.h>
#include <QtQml/qqmlcontext.h>
#include <QtQml/qqmlexpression.h>
#include <QtQml/qqmlincubator.h>
Say hello to QtQuick module This change moves the QtQuick 2 types and C++ API (including SceneGraph) to a new module (AKA library), QtQuick. 99% of this change is moving files from src/declarative to src/quick, and from tests/auto/declarative to tests/auto/qtquick2. The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to a plugin, src/imports/qtquick2, just like it's done for QtQuick 1. All tools, examples, and tests that use QtQuick C++ API have gotten "QT += quick" or "QT += quick-private" added to their .pro file. A few additional internal QtDeclarative classes had to be exported (via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the QtQuick 2 implementation. The old header locations (e.g. QtDeclarative/qquickitem.h) will still be supported for some time, but will produce compile-time warnings. (To avoid the QtQuick implementation using the compatibility headers (since QtDeclarative's includepath comes first), a few include statements were modified, e.g. from "#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".) There's a change in qtbase that automatically adds QtQuick to the module list if QtDeclarative is used. Together with the compatibility headers, this should help reduce the migration pain for existing projects. In theory, simply getting an existing QtDeclarative-based project to compile and link shouldn't require any changes for now -- but porting to the new scheme is of course recommended, and will eventually become mandatory. Task-number: QTBUG-22889 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-11-23 14:14:07 +00:00
#include <QtQuick/private/qquickpathview_p.h>
Add autotest for incorrect steal of flick. Task-number: QTBUG-37859 Change-Id: I86aa231ba264569a21d0b6cd109096eb5dd7a2fe Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-03-26 19:32:29 +00:00
#include <QtQuick/private/qquickflickable_p.h>
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
#include <QtQuick/private/qquickpath_p.h>
Say hello to QtQuick module This change moves the QtQuick 2 types and C++ API (including SceneGraph) to a new module (AKA library), QtQuick. 99% of this change is moving files from src/declarative to src/quick, and from tests/auto/declarative to tests/auto/qtquick2. The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to a plugin, src/imports/qtquick2, just like it's done for QtQuick 1. All tools, examples, and tests that use QtQuick C++ API have gotten "QT += quick" or "QT += quick-private" added to their .pro file. A few additional internal QtDeclarative classes had to be exported (via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the QtQuick 2 implementation. The old header locations (e.g. QtDeclarative/qquickitem.h) will still be supported for some time, but will produce compile-time warnings. (To avoid the QtQuick implementation using the compatibility headers (since QtDeclarative's includepath comes first), a few include statements were modified, e.g. from "#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".) There's a change in qtbase that automatically adds QtQuick to the module list if QtDeclarative is used. Together with the compatibility headers, this should help reduce the migration pain for existing projects. In theory, simply getting an existing QtDeclarative-based project to compile and link shouldn't require any changes for now -- but porting to the new scheme is of course recommended, and will eventually become mandatory. Task-number: QTBUG-22889 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-11-23 14:14:07 +00:00
#include <QtQuick/private/qquicktext_p.h>
#include <QtQuick/private/qquickrectangle_p.h>
tests/auto/quick: remove QQUICK_VERIFY_POLISH macro QQuickTest::qWaitForItemPolished() can be used instead now. Change-Id: I5b531d811271024c750c669c4013865514b2ebeb Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
2018-10-24 08:06:18 +00:00
#include <QtQuickTest/QtQuickTest>
Move model types into their own library The model types are not part of the core QML runtime and should only be loaded if you explicitly import them. We cannot enforce that in Qt5 as some of them are available from the QtQml import, but we can change it in Qt6. Change-Id: I1e49e84d748e352537ec2d4af901c034c91d038f Reviewed-by: Erik Verbruggen <erik.verbruggen@me.com>
2019-04-03 13:22:22 +00:00
#include <QtQmlModels/private/qqmllistmodel_p.h>
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
#include <QtQml/private/qqmlvaluetype_p.h>
Changing PathView model after componentComplete should reset position If the model is changed after the component is completed, the offset and currentIndex should be reset to 0. Change-Id: Ie36eb0c17ce6602c6ae15b5ee7aeb8b1a6e7854b Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-18 00:36:17 +00:00
#include <QtGui/qstandarditemmodel.h>
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
#include <QStringListModel>
#include <QFile>
Say hello to QtQuick module This change moves the QtQuick 2 types and C++ API (including SceneGraph) to a new module (AKA library), QtQuick. 99% of this change is moving files from src/declarative to src/quick, and from tests/auto/declarative to tests/auto/qtquick2. The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to a plugin, src/imports/qtquick2, just like it's done for QtQuick 1. All tools, examples, and tests that use QtQuick C++ API have gotten "QT += quick" or "QT += quick-private" added to their .pro file. A few additional internal QtDeclarative classes had to be exported (via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the QtQuick 2 implementation. The old header locations (e.g. QtDeclarative/qquickitem.h) will still be supported for some time, but will produce compile-time warnings. (To avoid the QtQuick implementation using the compatibility headers (since QtDeclarative's includepath comes first), a few include statements were modified, e.g. from "#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".) There's a change in qtbase that automatically adds QtQuick to the module list if QtDeclarative is used. Together with the compatibility headers, this should help reduce the migration pain for existing projects. In theory, simply getting an existing QtDeclarative-based project to compile and link shouldn't require any changes for now -- but porting to the new scheme is of course recommended, and will eventually become mandatory. Task-number: QTBUG-22889 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-11-23 14:14:07 +00:00
#include "../../shared/util.h"
Separate out some of the common test code Moves findItem, findItems() etc. into shared/visualtestutil.h and moves duplicate list model test classes and other common view-specific code into shared/viewtestutil.h. Change-Id: Ia79bc4df1ab7fb618597755c0288a2e8f5054faf Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-01-31 07:15:00 +00:00
#include "../shared/viewtestutil.h"
#include "../shared/visualtestutil.h"
Add missing math.h include for math functions On some platforms, math functions in the std namespace don't work even if cmath is included. Change-Id: Ia71d22b07f508e0584de5320f376fbf4b3a2887b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2017-09-08 05:20:14 +00:00
#include <math.h>
Prevent PathView's parent stealing mouse grab during double-flick This commit fixes an issue where mouse events could be stolen by the parent of a PathView due to the PathView not correctly setting the keep-mouse-grab flag in handleMousePressEvent(). This commit ensures that the flag is correctly set, so that the second flick in a double flick is handled by the PathView rather than being stolen by the parent. Task-number: QTBUG-59620 Change-Id: Iccdfe16e7e80e6d1d31f95c3dba9c8839b20f30f Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2017-05-02 06:25:37 +00:00
Q_LOGGING_CATEGORY(lcTests, "qt.quick.tests")
Separate out some of the common test code Moves findItem, findItems() etc. into shared/visualtestutil.h and moves duplicate list model test classes and other common view-specific code into shared/viewtestutil.h. Change-Id: Ia79bc4df1ab7fb618597755c0288a2e8f5054faf Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-01-31 07:15:00 +00:00
using namespace QQuickViewTestUtil;
using namespace QQuickVisualTestUtil;
Fix PathView not updating after all items are removed from the model. Always clear the layoutScheduled flag on a refill even if there are no items to create, otherwise future layouts won't be scheduled because it appears one is already pending. Fixes an issue in the dragselection example where items that should have moved to the PathView instead disappeared. Change-Id: I4302b5b43184c697a78f5c09dc3811326e2271ca Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-25 01:41:17 +00:00
Q_DECLARE_METATYPE(QQuickPathView::HighlightRangeMode)
Add methods to PathView: positionViewAtIndex(), indexAt(), itemAt() These methods are already present in ListView and GridView. Change-Id: I3777fccdecd77c8ab756a0062c71c6e1bfb749ef Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-23 01:08:06 +00:00
Q_DECLARE_METATYPE(QQuickPathView::PositionMode)
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
static void initStandardTreeModel(QStandardItemModel *model)
{
QStandardItem *item;
item = new QStandardItem(QLatin1String("Row 1 Item"));
model->insertRow(0, item);
item = new QStandardItem(QLatin1String("Row 2 Item"));
item->setCheckable(true);
model->insertRow(1, item);
QStandardItem *childItem = new QStandardItem(QLatin1String("Row 2 Child Item"));
item->setChild(0, childItem);
item = new QStandardItem(QLatin1String("Row 3 Item"));
item->setIcon(QIcon());
model->insertRow(2, item);
}
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
class tst_QQuickPathView : public QQmlDataTest
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Q_OBJECT
public:
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
tst_QQuickPathView();
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
private slots:
void initValues();
void items();
void dataModel();
void pathview2();
void pathview3();
Changing PathView model after componentComplete should reset position If the model is changed after the component is completed, the offset and currentIndex should be reset to 0. Change-Id: Ie36eb0c17ce6602c6ae15b5ee7aeb8b1a6e7854b Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-18 00:36:17 +00:00
void initialCurrentIndex();
PathView: Fix QML engine thinking currentItem is null when it's not QML didn't re-evaluate any bindings using currentItem because a notification was missing. Change-Id: Icdaa3022e0b01644a060e577d87f011b4ea9fabb Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2014-09-30 12:23:56 +00:00
void initialCurrentItem();
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
void insertModel_data();
void insertModel();
void removeModel_data();
void removeModel();
void moveModel_data();
void moveModel();
Fix PathView not updating after all items are removed from the model. Always clear the layoutScheduled flag on a refill even if there are no items to create, otherwise future layouts won't be scheduled because it appears one is already pending. Fixes an issue in the dragselection example where items that should have moved to the PathView instead disappeared. Change-Id: I4302b5b43184c697a78f5c09dc3811326e2271ca Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-25 01:41:17 +00:00
void consecutiveModelChanges_data();
void consecutiveModelChanges();
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
void path();
void pathMoved();
Changing PathView offset doesn't set currentIndex appropriately If the highlightRangeMode is StrictlyEnforceRange then the currentIndex should always be updated when the path offset changes. Task-number: QTBUG-19835 Change-Id: I2371e5abd430e770bbb8f9f9d5f4e1d17e0d8ff5 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2012-06-27 04:05:38 +00:00
void offset_data();
void offset();
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
void setCurrentIndex();
Fix incorrect PathView.currentIndex assignment with StrictlyEnforceRange If currentIndex is quickly assigned a different index and then the previous current index again, it should not move. Fixes: QTBUG-74508 Change-Id: I8d610e3fe452c8631e082c648e77d2cb70ae57c5 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-03-21 13:36:57 +00:00
void setCurrentIndexWrap();
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
void resetModel();
void propertyChanges();
void pathChanges();
void componentChanges();
void modelChanges();
void pathUpdateOnStartChanged();
void package();
void emptyModel();
Fix crash in PathView Change-Id: I259e7af1755ff9615782bbce03fc41ea1957cab3 Task-number: QTBUG-29176 Reviewed-by: Alan Alpert <aalpert@rim.com>
2013-01-17 09:46:45 +00:00
void emptyPath();
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
void closed();
void pathUpdate();
void visualDataModel();
void undefinedPath();
void mouseDrag();
Fix PathView stealing mouse grab from its child items. Apply the improvements that have been applied to Flickables handling of child items over time to PathView to bring its behavior back in line. Task-number: QTBUG-33699 Change-Id: I76a412d75c48f9cf2f12f5f6f1aa01ff62d06364 Reviewed-by: Joona Petrell <joona.petrell@jollamobile.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
2013-09-27 04:26:48 +00:00
void nestedMouseAreaDrag();
PathView: grab mouse on press if already moving A side effect of 8fd398c9d2f5f54e446e0b402bc63a2edb50da6f is that it became possible for the highlight to stop between items, rather than snapping to a specific item, if the user taps, clicks or drags an additional time while the movement is ongoing. That was because it didn't get a mouse grab, so it missed the release event. QQuickPathViewPrivate::handleMouseReleaseEvent() needs to take care of the snapping behavior after the user stops dragging. This only affects behavior in the case that the PathView is already moving and the mouse is pressed again: we assume the user wants to alter the PathView's velocity, not interact with any delegate inside or with any parent item. Task-number: QTBUG-77173 Task-number: QTBUG-59620 Change-Id: I7b2f69a6ef8d8022d7c917a5bf9e8fb40c8848db Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-09-05 11:57:19 +00:00
void flickNClick();
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
void treeModel();
void changePreferredHighlight();
Correctly set ending path percent if none is provided. Task-number: QTBUG-19818 Change-Id: I5377551d041b593864d56e4449c133deb47d3b45 Reviewed-on: http://codereview.qt.nokia.com/2358 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-07-29 00:41:47 +00:00
void missingPercent();
Fix ListView components being unable to access context properties. Where avaialable use the components creation context instead of the views context as the root context for the new item. Task-number: QTBUG-21865 Change-Id: I07e564548de57d58413dc0d7cd151bd8a90886e7 Reviewed-on: http://codereview.qt-project.org/6199 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-10-07 03:06:26 +00:00
void creationContext();
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
void currentOffsetOnInsertion();
Non-blocking view delegate instantiation. Task-number: QTBUG-21792 Change-Id: I29a4028cd24eb55d4768aacaa3abbd1786061398 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2011-11-03 05:52:13 +00:00
void asynchronous();
Restore view to sensible position if grab is cancelled. If the mouse grab is stolen, return to allowed bounds. Change-Id: Icc44da32ff62bed273f0ccbb5498766981cdf9a4 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-03-15 04:58:03 +00:00
void cancelDrag();
PathView was missing the maximumFlickVelocity property Change-Id: I0ed4ff0fe169187f7a8e03597be7407e9896100d Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-25 02:37:08 +00:00
void maximumFlickVelocity();
Support snapMode in PathView PathView missed out on snapMode, which is especially useful for its SnapOneItem mode. Change-Id: I0e9b080ef72d9bc1e305445cd8dfde8e21e4e3da Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-21 03:18:05 +00:00
void snapToItem();
void snapToItem_data();
void snapOneItem();
void snapOneItem_data();
Add methods to PathView: positionViewAtIndex(), indexAt(), itemAt() These methods are already present in ListView and GridView. Change-Id: I3777fccdecd77c8ab756a0062c71c6e1bfb749ef Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-23 01:08:06 +00:00
void positionViewAtIndex();
void positionViewAtIndex_data();
void indexAt_itemAt();
void indexAt_itemAt_data();
Add cacheItemCount property to PathView cacheItemCount specifies the number of items to cache off the path when pathItemCount is specified. This allows up to cacheItemCount items to be kept alive when they move off the path, and also to asynchronously create items off path in preparation for display when the path offset changes. This is the equivalent of cacheBuffer for other views. Task-number: QTBUG-23931 Change-Id: I03497537d3f929e5e3579536850dd43eb2724c38 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-08-21 04:47:48 +00:00
void cacheItemCount();
Schedule layout changes to avoid refill() recursion. Otherwise we add duplicate item delegates. Task-number: QTBUG-40298 Change-Id: I8a2221d72f458c892720a71d87513808a5d725a6 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-07-21 12:55:30 +00:00
void changePathDuringRefill();
Synchronize PathView gesture grabbing with other items. PathView didn't attempt to grab the gesture at the same event as other items. This prevented PathView from rightfully claiming the gesture before lower items in the stack. Use the same threshold test for PathView as used elsewhere. Task-number: QTBUG-37859 Change-Id: Ic57cb805ac979e41c3e35d86b2e7db781e61d69d Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-07-23 06:07:31 +00:00
void nestedinFlickable();
Fix incorrect behavior of PathView with ungrabMouse() When the grabbed Item is released and then grabbed again, if ungrabMouse () is called, the animation stops. In order to avoid this, when ungrabMouse () is called, if offset is different, it is modified to animate. Task-number: QTBUG-79592 Change-Id: I61cbd4dad90643722f12480f0dab3859ce116af8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-11-14 07:16:39 +00:00
void ungrabNestedinFlickable();
Synchronize PathView gesture grabbing with other items. PathView didn't attempt to grab the gesture at the same event as other items. This prevented PathView from rightfully claiming the gesture before lower items in the stack. Use the same threshold test for PathView as used elsewhere. Task-number: QTBUG-37859 Change-Id: Ic57cb805ac979e41c3e35d86b2e7db781e61d69d Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-07-23 06:07:31 +00:00
void flickableDelegate();
Repeater & itemviews: fix setModel() JS array handling QVariant comparison in setModel() started failing because JS arrays are now passed as a QJSValue. Re-assigning the same array content should not trigger a model change. This change restores the old behavior it had before, when JS arrays were passed as QVariantLists. Change-Id: I1882b3531f2893b116dbd817edeecab1ae812ce8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-10-29 12:59:46 +00:00
void jsArrayChange();
PathView: fix infinite construction/destruction loop ... when all (or almost all) items are in the cache. When all items are in cache, check lower bound is equal to upper_bound. In rare cases, especially when almost all items are in cache, the inserting code was used (not only appending and prepending). In this code there was not bound check before creation of item and there was such situation: 1. Create item by inserting code (without bound check) 2. At the next call of refill() remove this item by life cycle because this item does not meet the conditions. And go to step 1. In other words at the first call we create some item, at the second remove this item. And again. So we had infinite construction/destruction loop. To break it we should check position of new item before creation in inserting code too (like we do in appending and prepending code). Task-number: QTBUG-37815 Change-Id: I015cdeb67ca5fcd06c34b3145b49cbd3e38d4078 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2016-05-26 11:45:31 +00:00
void qtbug37815();
Remove ordered list assumptions in PathView When flicking fast or jumping around on paths with some items not seen, the current algorithm makes assumptions about list ordering which are hard to maintain. Specifically that it has the index of the first item in the list cached and that all changed will be to either prepend or append an item to the current ordered set. This patch removes that assumption, leading to a little more work each time to identify where new elements will go. There is still a slightly faster path for the common case of adding elements to the beginning or end of the path. Task-number: QTBUG-42716 Change-Id: Ief76c93967d254d405e6656ef27d06b4ecc470c8 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2015-05-07 05:56:03 +00:00
void qtbug42716();
PathView: fix item creation First call of QQuickPathView::refill() did not use currentIndex for item prepending and there was situation when items were not created, e.g.: PathView with current item in center and currentIndex was set so that item with index 0 was after current item and before path end. The result of this situation: items from path begin to current item were not created. The reason was that idx always equaled (modelCount-1) for item prepending. Now first filling uses currentIndex to calculate valid idx. Task-number: QTBUG-53464 Change-Id: I7e343b0712c9c5c5cd56b1d8e020cf8c0f6e6301 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2016-05-24 09:21:39 +00:00
void qtbug53464();
Clear stringCache explicitly instead of asserting its emptiness. This assumption does not hold when PathView's path.pathElements list is updated with new contents at runtime. Task-number: QTBUG-46255 Change-Id: I6b0d7ee8ee2d67ca0138eacdf0ad221338f788e4 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2015-05-21 07:52:49 +00:00
void addCustomAttribute();
Quick: expose movementDirection of PathView It is needed by the behavior of TabBar in universal style in QtQC2. [ChangeLog][QtQuick][PathView] Added movementDirection property Change-Id: Iedc214a12e7336e52125ec82b9ded45502905978 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
2016-04-26 12:12:14 +00:00
void movementDirection_data();
void movementDirection();
PathView: fix crash on path remove There was no check if new path is a valid object Task-number: QTBUG-53917 Change-Id: I2fd9534c1d34633243d16eda56a2b07e18dabe16 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
2016-12-28 22:40:11 +00:00
void removePath();
QQuickPathViewPrivate: fix heap-use-after-free The TabBar auto tests in Qt Quick Controls 2 repeats the following process very quickly for several data rows: 1. Creates a TabBar (PathView, when using the Universal style) 2. Moves items in its QQmlObjectModel 3. Deletes the TabBar When run with ASAN, this test would fail, because the TabButtons (which are child items of the PathView) would try to access a deleted QQuickItemChangeListener upon their destruction. The underlying issue is that QQuickPathView::modelUpdated() is called, and before a refill() can happen, the view is deleted. QQuickPathView::refill() was the only execution path that was releasing the cached items (QQuickPathViewPrivate::itemCache), and since part of releasing an item involves removing the QQuickPathView as a change listener from the item, the item would access the deleted view (listener) when the item was being destroyed. This patch fixes the issue by also releasing cached items in QQuickPathViewPrivate::clear(), which is always called by the destructor. Task-number: QTBUG-68964 Change-Id: Ic5bf0943be79948c86bf7c07ef13ecd1a7b971ba Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
2018-06-19 14:04:24 +00:00
void objectModelMove();
Support required properties in model delegates If a delegates declares a required property of a given name, and that name exists as a role in the model, we set the property accordingly. The same holds true for the special properties that come from the QQmlDelegateModel like "index" and "model". All roles are still injected into scope and thus accessible; changing this in Qt5 would be tedious or even impossible while still maintaining backwardscompatibility with delegates that do not use required properties. Change-Id: I4f388ba549c42f1ff9822bdb3b8357c4d45e4b66 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-08-15 08:03:57 +00:00
void requiredPropertiesInDelegate();
void requiredPropertiesInDelegatePreventUnrelated();
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
};
class TestObject : public QObject
{
Q_OBJECT
Q_PROPERTY(bool error READ error WRITE setError)
Q_PROPERTY(bool useModel READ useModel NOTIFY useModelChanged)
Q_PROPERTY(int pathItemCount READ pathItemCount NOTIFY pathItemCountChanged)
public:
TestObject() : QObject(), mError(true), mUseModel(true), mPathItemCount(-1) {}
bool error() const { return mError; }
void setError(bool err) { mError = err; }
bool useModel() const { return mUseModel; }
void setUseModel(bool use) { mUseModel = use; emit useModelChanged(); }
int pathItemCount() const { return mPathItemCount; }
void setPathItemCount(int count) { mPathItemCount = count; emit pathItemCountChanged(); }
signals:
void useModelChanged();
void pathItemCountChanged();
private:
bool mError;
bool mUseModel;
int mPathItemCount;
};
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
tst_QQuickPathView::tst_QQuickPathView()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::initValues()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQmlEngine engine;
QQmlComponent c(&engine, testFileUrl("pathview1.qml"));
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickPathView *obj = qobject_cast<QQuickPathView*>(c.create());
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(obj != nullptr);
tests/quick: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: Ib9f4c2486af23c47990be4b9e004b965de226dcc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-07-24 13:32:22 +00:00
QVERIFY(!obj->path());
QVERIFY(!obj->delegate());
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(obj->model(), QVariant());
QCOMPARE(obj->currentIndex(), 0);
QCOMPARE(obj->offset(), 0.);
QCOMPARE(obj->preferredHighlightBegin(), 0.);
QCOMPARE(obj->dragMargin(), 0.);
QCOMPARE(obj->count(), 0);
QCOMPARE(obj->pathItemCount(), -1);
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
delete obj;
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::items()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
Separate out some of the common test code Moves findItem, findItems() etc. into shared/visualtestutil.h and moves duplicate list model test classes and other common view-specific code into shared/viewtestutil.h. Change-Id: Ia79bc4df1ab7fb618597755c0288a2e8f5054faf Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-01-31 07:15:00 +00:00
QaimModel model;
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
model.addItem("Fred", "12345");
model.addItem("John", "2345");
model.addItem("Bob", "54321");
model.addItem("Bill", "4321");
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQmlContext *ctxt = window->rootContext();
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
ctxt->setContextProperty("testModel", &model);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->setSource(testFileUrl("pathview0.qml"));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
qApp->processEvents();
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathview = findItem<QQuickPathView>(window->rootObject(), "view");
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
Update SG items with recent GV item changes. Change-Id: Ib9cadea91ab3717bee0caf2071102a100e81969d
2011-05-30 06:35:52 +00:00
QCOMPARE(pathview->count(), model.count());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QCOMPARE(window->rootObject()->property("count").toInt(), model.count());
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(pathview->childItems().count(), model.count()+1); // assumes all are visible, including highlight
for (int i = 0; i < model.count(); ++i) {
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickText *name = findItem<QQuickText>(pathview, "textName", i);
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(name != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(name->text(), model.name(i));
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickText *number = findItem<QQuickText>(pathview, "textNumber", i);
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(number != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(number->text(), model.number(i));
}
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path());
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(path);
QVERIFY(pathview->highlightItem());
Expose QQuickPath::pointAtPercent as Q_INVOKABLE So it can be used in QML. Useful in combination with ShapePath, in order to add graphics along a Shape. [ChangeLog][QtQuick][Shapes] Exposed QQuickPath::pointAtPercent as invokable in QML. Change-Id: Ia8aeb2b74003410ce16d9d2a0c62d79a021530af Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-05-27 21:36:31 +00:00
QPointF start = path->pointAtPercent(0.0);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QPointF offset;
offset.setX(pathview->highlightItem()->width()/2);
offset.setY(pathview->highlightItem()->height()/2);
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QCOMPARE(pathview->highlightItem()->position() + offset, start);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
}
PathView: Fix QML engine thinking currentItem is null when it's not QML didn't re-evaluate any bindings using currentItem because a notification was missing. Change-Id: Icdaa3022e0b01644a060e577d87f011b4ea9fabb Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2014-09-30 12:23:56 +00:00
void tst_QQuickPathView::initialCurrentItem()
{
QScopedPointer<QQuickView> window(createView());
QaimModel model;
model.addItem("Jules", "12345");
model.addItem("Vicent", "2345");
model.addItem("Marvin", "54321");
QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
window->setSource(testFileUrl("pathview4.qml"));
qApp->processEvents();
QQuickPathView *pathview = findItem<QQuickPathView>(window->rootObject(), "view");
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
PathView: Fix QML engine thinking currentItem is null when it's not QML didn't re-evaluate any bindings using currentItem because a notification was missing. Change-Id: Icdaa3022e0b01644a060e577d87f011b4ea9fabb Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2014-09-30 12:23:56 +00:00
QVERIFY(pathview->currentIndex() != -1);
QVERIFY(!window->rootObject()->property("currentItemIsNull").toBool());
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::pathview2()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQmlEngine engine;
QQmlComponent c(&engine, testFileUrl("pathview2.qml"));
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickPathView *obj = qobject_cast<QQuickPathView*>(c.create());
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(obj != nullptr);
QVERIFY(obj->path() != nullptr);
QVERIFY(obj->delegate() != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(obj->model() != QVariant());
QCOMPARE(obj->currentIndex(), 0);
QCOMPARE(obj->offset(), 0.);
QCOMPARE(obj->preferredHighlightBegin(), 0.);
QCOMPARE(obj->dragMargin(), 0.);
QCOMPARE(obj->count(), 8);
QCOMPARE(obj->pathItemCount(), 10);
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
delete obj;
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::pathview3()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQmlEngine engine;
QQmlComponent c(&engine, testFileUrl("pathview3.qml"));
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickPathView *obj = qobject_cast<QQuickPathView*>(c.create());
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(obj != nullptr);
QVERIFY(obj->path() != nullptr);
QVERIFY(obj->delegate() != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(obj->model() != QVariant());
Changing PathView offset doesn't set currentIndex appropriately If the highlightRangeMode is StrictlyEnforceRange then the currentIndex should always be updated when the path offset changes. Task-number: QTBUG-19835 Change-Id: I2371e5abd430e770bbb8f9f9d5f4e1d17e0d8ff5 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2012-06-27 04:05:38 +00:00
QCOMPARE(obj->currentIndex(), 7);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(obj->offset(), 1.0);
QCOMPARE(obj->preferredHighlightBegin(), 0.5);
QCOMPARE(obj->dragMargin(), 24.);
QCOMPARE(obj->count(), 8);
QCOMPARE(obj->pathItemCount(), 4);
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
delete obj;
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
}
Changing PathView model after componentComplete should reset position If the model is changed after the component is completed, the offset and currentIndex should be reset to 0. Change-Id: Ie36eb0c17ce6602c6ae15b5ee7aeb8b1a6e7854b Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-18 00:36:17 +00:00
void tst_QQuickPathView::initialCurrentIndex()
{
QQmlEngine engine;
QQmlComponent c(&engine, testFileUrl("initialCurrentIndex.qml"));
QQuickPathView *obj = qobject_cast<QQuickPathView*>(c.create());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(obj != nullptr);
QVERIFY(obj->path() != nullptr);
QVERIFY(obj->delegate() != nullptr);
Changing PathView model after componentComplete should reset position If the model is changed after the component is completed, the offset and currentIndex should be reset to 0. Change-Id: Ie36eb0c17ce6602c6ae15b5ee7aeb8b1a6e7854b Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-18 00:36:17 +00:00
QVERIFY(obj->model() != QVariant());
QCOMPARE(obj->currentIndex(), 3);
QCOMPARE(obj->offset(), 5.0);
QCOMPARE(obj->preferredHighlightBegin(), 0.5);
QCOMPARE(obj->dragMargin(), 24.);
QCOMPARE(obj->count(), 8);
QCOMPARE(obj->pathItemCount(), 4);
delete obj;
}
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
void tst_QQuickPathView::insertModel_data()
{
QTest::addColumn<int>("mode");
QTest::addColumn<int>("idx");
QTest::addColumn<int>("count");
QTest::addColumn<qreal>("offset");
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
QTest::addColumn<int>("currentIndex");
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
// We have 8 items, with currentIndex == 4
QTest::newRow("insert after current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 6 << 1 << qreal(5.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("insert before current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 2 << 1 << qreal(4.)<< 5;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("insert multiple after current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 5 << 2 << qreal(6.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("insert multiple before current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 1 << 2 << qreal(4.) << 6;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("insert at end")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 8 << 1 << qreal(5.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("insert at beginning")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 0 << 1 << qreal(4.) << 5;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("insert at current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 4 << 1 << qreal(4.) << 5;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - insert after current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 6 << 1 << qreal(5.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - insert before current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 2 << 1 << qreal(4.) << 5;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - insert multiple after current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 5 << 2 << qreal(6.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - insert multiple before current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 1 << 2 << qreal(4.) << 6;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - insert at end")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 8 << 1 << qreal(5.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - insert at beginning")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 0 << 1 << qreal(4.) << 5;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - insert at current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 4 << 1 << qreal(4.) << 5;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
}
void tst_QQuickPathView::insertModel()
{
Skip test that is currently asserting on macOS Task-number: QTBUG-68048 Change-Id: If27ba1c003b711599cd8fbbd000514fc7fd5f05f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-05-02 10:02:11 +00:00
#ifdef Q_OS_MACOS
QSKIP("this test currently crashes on MacOS. See QTBUG-68048");
#endif
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QFETCH(int, mode);
QFETCH(int, idx);
QFETCH(int, count);
QFETCH(qreal, offset);
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
QFETCH(int, currentIndex);
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->show();
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
Separate out some of the common test code Moves findItem, findItems() etc. into shared/visualtestutil.h and moves duplicate list model test classes and other common view-specific code into shared/viewtestutil.h. Change-Id: Ia79bc4df1ab7fb618597755c0288a2e8f5054faf Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-01-31 07:15:00 +00:00
QaimModel model;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
model.addItem("Ben", "12345");
model.addItem("Bohn", "2345");
model.addItem("Bob", "54321");
model.addItem("Bill", "4321");
model.addItem("Jinny", "679");
model.addItem("Milly", "73378");
model.addItem("Jimmy", "3535");
model.addItem("Barb", "9039");
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQmlContext *ctxt = window->rootContext();
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
ctxt->setContextProperty("testModel", &model);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->setSource(testFileUrl("pathview0.qml"));
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
qApp->processEvents();
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathview = findItem<QQuickPathView>(window->rootObject(), "view");
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
pathview->setHighlightRangeMode((QQuickPathView::HighlightRangeMode)mode);
pathview->setCurrentIndex(4);
if (mode == QQuickPathView::StrictlyEnforceRange)
QTRY_COMPARE(pathview->offset(), 4.0);
else
pathview->setOffset(4);
QList<QPair<QString, QString> > items;
for (int i = 0; i < count; ++i)
items.append(qMakePair(QString("New"), QString::number(i)));
model.insertItems(idx, items);
QTRY_COMPARE(pathview->offset(), offset);
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
QCOMPARE(pathview->currentIndex(), currentIndex);
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
}
void tst_QQuickPathView::removeModel_data()
{
QTest::addColumn<int>("mode");
QTest::addColumn<int>("idx");
QTest::addColumn<int>("count");
QTest::addColumn<qreal>("offset");
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
QTest::addColumn<int>("currentIndex");
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
// We have 8 items, with currentIndex == 4
QTest::newRow("remove after current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 6 << 1 << qreal(3.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("remove before current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 2 << 1 << qreal(4.) << 3;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("remove multiple after current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 5 << 2 << qreal(2.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("remove multiple before current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 1 << 2 << qreal(4.) << 2;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("remove last")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 7 << 1 << qreal(3.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("remove first")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 0 << 1 << qreal(4.) << 3;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("remove current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 4 << 1 << qreal(3.) << 4;
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
QTest::newRow("remove all")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 0 << 8 << qreal(0.) << 0;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - remove after current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 6 << 1 << qreal(3.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - remove before current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 2 << 1 << qreal(4.) << 3;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - remove multiple after current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 5 << 2 << qreal(2.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - remove multiple before current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 1 << 2 << qreal(4.) << 2;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - remove last")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 7 << 1 << qreal(3.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - remove first")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 0 << 1 << qreal(4.) << 3;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - remove current offset")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 4 << 1 << qreal(4.) << 4;
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
QTest::newRow("no range - remove all")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 0 << 8 << qreal(0.) << 0;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
}
void tst_QQuickPathView::removeModel()
{
QFETCH(int, mode);
QFETCH(int, idx);
QFETCH(int, count);
QFETCH(qreal, offset);
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
QFETCH(int, currentIndex);
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->show();
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
Separate out some of the common test code Moves findItem, findItems() etc. into shared/visualtestutil.h and moves duplicate list model test classes and other common view-specific code into shared/viewtestutil.h. Change-Id: Ia79bc4df1ab7fb618597755c0288a2e8f5054faf Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-01-31 07:15:00 +00:00
QaimModel model;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
model.addItem("Ben", "12345");
model.addItem("Bohn", "2345");
model.addItem("Bob", "54321");
model.addItem("Bill", "4321");
model.addItem("Jinny", "679");
model.addItem("Milly", "73378");
model.addItem("Jimmy", "3535");
model.addItem("Barb", "9039");
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQmlContext *ctxt = window->rootContext();
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
ctxt->setContextProperty("testModel", &model);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->setSource(testFileUrl("pathview0.qml"));
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
qApp->processEvents();
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathview = findItem<QQuickPathView>(window->rootObject(), "view");
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
pathview->setHighlightRangeMode((QQuickPathView::HighlightRangeMode)mode);
pathview->setCurrentIndex(4);
if (mode == QQuickPathView::StrictlyEnforceRange)
QTRY_COMPARE(pathview->offset(), 4.0);
else
pathview->setOffset(4);
model.removeItems(idx, count);
QTRY_COMPARE(pathview->offset(), offset);
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
QCOMPARE(pathview->currentIndex(), currentIndex);
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
}
void tst_QQuickPathView::moveModel_data()
{
QTest::addColumn<int>("mode");
QTest::addColumn<int>("from");
QTest::addColumn<int>("to");
QTest::addColumn<int>("count");
QTest::addColumn<qreal>("offset");
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
QTest::addColumn<int>("currentIndex");
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
// We have 8 items, with currentIndex == 4
QTest::newRow("move after current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 5 << 6 << 1 << qreal(4.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("move before current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 2 << 3 << 1 << qreal(4.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("move before current to after")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 2 << 6 << 1 << qreal(5.) << 3;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("move multiple after current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 5 << 6 << 2 << qreal(4.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("move multiple before current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 0 << 1 << 2 << qreal(4.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("move before current to end")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 2 << 7 << 1 << qreal(5.) << 3;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("move last to beginning")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 7 << 0 << 1 << qreal(3.) << 5;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("move current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::StrictlyEnforceRange) << 4 << 6 << 1 << qreal(2.) << 6;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - move after current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 5 << 6 << 1 << qreal(4.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - move before current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 2 << 3 << 1 << qreal(4.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - move before current to after")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 2 << 6 << 1 << qreal(5.) << 3;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - move multiple after current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 5 << 6 << 2 << qreal(4.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - move multiple before current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 0 << 1 << 2 << qreal(4.) << 4;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - move before current to end")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 2 << 7 << 1 << qreal(5.) << 3;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - move last to beginning")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 7 << 0 << 1 << qreal(3.) << 5;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - move current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 4 << 6 << 1 << qreal(4.) << 6;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
QTest::newRow("no range - move multiple incl. current")
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
<< int(QQuickPathView::NoHighlightRange) << 0 << 1 << 5 << qreal(4.) << 5;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
}
void tst_QQuickPathView::moveModel()
{
QFETCH(int, mode);
QFETCH(int, from);
QFETCH(int, to);
QFETCH(int, count);
QFETCH(qreal, offset);
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
QFETCH(int, currentIndex);
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->show();
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
Separate out some of the common test code Moves findItem, findItems() etc. into shared/visualtestutil.h and moves duplicate list model test classes and other common view-specific code into shared/viewtestutil.h. Change-Id: Ia79bc4df1ab7fb618597755c0288a2e8f5054faf Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-01-31 07:15:00 +00:00
QaimModel model;
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
model.addItem("Ben", "12345");
model.addItem("Bohn", "2345");
model.addItem("Bob", "54321");
model.addItem("Bill", "4321");
model.addItem("Jinny", "679");
model.addItem("Milly", "73378");
model.addItem("Jimmy", "3535");
model.addItem("Barb", "9039");
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQmlContext *ctxt = window->rootContext();
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
ctxt->setContextProperty("testModel", &model);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->setSource(testFileUrl("pathview0.qml"));
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
qApp->processEvents();
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathview = findItem<QQuickPathView>(window->rootObject(), "view");
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
pathview->setHighlightRangeMode((QQuickPathView::HighlightRangeMode)mode);
pathview->setCurrentIndex(4);
if (mode == QQuickPathView::StrictlyEnforceRange)
QTRY_COMPARE(pathview->offset(), 4.0);
else
pathview->setOffset(4);
model.moveItems(from, to, count);
QTRY_COMPARE(pathview->offset(), offset);
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
QCOMPARE(pathview->currentIndex(), currentIndex);
Fix PathView insertion/removal/move item offset Fix item positioning post model changes and add auto tests. Also fixes crash when inserting items before currentIndex, causing offset to increase beyond item count. Task-number: TBUG-22785 Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-22 07:26:49 +00:00
}
Fix PathView not updating after all items are removed from the model. Always clear the layoutScheduled flag on a refill even if there are no items to create, otherwise future layouts won't be scheduled because it appears one is already pending. Fixes an issue in the dragselection example where items that should have moved to the PathView instead disappeared. Change-Id: I4302b5b43184c697a78f5c09dc3811326e2271ca Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-25 01:41:17 +00:00
void tst_QQuickPathView::consecutiveModelChanges_data()
{
QTest::addColumn<QQuickPathView::HighlightRangeMode>("mode");
QTest::addColumn<QList<ListChange> >("changes");
QTest::addColumn<int>("count");
QTest::addColumn<qreal>("offset");
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
QTest::addColumn<int>("currentIndex");
Fix PathView not updating after all items are removed from the model. Always clear the layoutScheduled flag on a refill even if there are no items to create, otherwise future layouts won't be scheduled because it appears one is already pending. Fixes an issue in the dragselection example where items that should have moved to the PathView instead disappeared. Change-Id: I4302b5b43184c697a78f5c09dc3811326e2271ca Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-25 01:41:17 +00:00
QTest::newRow("no range - insert after, insert before")
<< QQuickPathView::NoHighlightRange
<< (QList<ListChange>()
<< ListChange::insert(7, 2)
<< ListChange::insert(1, 3))
<< 13
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
<< 6.
<< 7;
Fix PathView not updating after all items are removed from the model. Always clear the layoutScheduled flag on a refill even if there are no items to create, otherwise future layouts won't be scheduled because it appears one is already pending. Fixes an issue in the dragselection example where items that should have moved to the PathView instead disappeared. Change-Id: I4302b5b43184c697a78f5c09dc3811326e2271ca Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-25 01:41:17 +00:00
QTest::newRow("no range - remove after, remove before")
<< QQuickPathView::NoHighlightRange
<< (QList<ListChange>()
<< ListChange::remove(6, 2)
<< ListChange::remove(1, 3))
<< 3
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
<< 2.
<< 1;
Fix PathView not updating after all items are removed from the model. Always clear the layoutScheduled flag on a refill even if there are no items to create, otherwise future layouts won't be scheduled because it appears one is already pending. Fixes an issue in the dragselection example where items that should have moved to the PathView instead disappeared. Change-Id: I4302b5b43184c697a78f5c09dc3811326e2271ca Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-25 01:41:17 +00:00
QTest::newRow("no range - remove after, insert before")
<< QQuickPathView::NoHighlightRange
<< (QList<ListChange>()
<< ListChange::remove(5, 2)
<< ListChange::insert(1, 3))
<< 9
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
<< 2.
<< 7;
Fix PathView not updating after all items are removed from the model. Always clear the layoutScheduled flag on a refill even if there are no items to create, otherwise future layouts won't be scheduled because it appears one is already pending. Fixes an issue in the dragselection example where items that should have moved to the PathView instead disappeared. Change-Id: I4302b5b43184c697a78f5c09dc3811326e2271ca Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-25 01:41:17 +00:00
QTest::newRow("no range - insert after, remove before")
<< QQuickPathView::NoHighlightRange
<< (QList<ListChange>()
<< ListChange::insert(6, 2)
<< ListChange::remove(1, 3))
<< 7
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
<< 6.
<< 1;
Fix PathView not updating after all items are removed from the model. Always clear the layoutScheduled flag on a refill even if there are no items to create, otherwise future layouts won't be scheduled because it appears one is already pending. Fixes an issue in the dragselection example where items that should have moved to the PathView instead disappeared. Change-Id: I4302b5b43184c697a78f5c09dc3811326e2271ca Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-25 01:41:17 +00:00
QTest::newRow("no range - insert, remove all, polish, insert")
<< QQuickPathView::NoHighlightRange
<< (QList<ListChange>()
<< ListChange::insert(3, 1)
<< ListChange::remove(0, 9)
<< ListChange::polish()
<< ListChange::insert(0, 3))
<< 3
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
<< 0.
<< 0;
Fix PathView not updating after all items are removed from the model. Always clear the layoutScheduled flag on a refill even if there are no items to create, otherwise future layouts won't be scheduled because it appears one is already pending. Fixes an issue in the dragselection example where items that should have moved to the PathView instead disappeared. Change-Id: I4302b5b43184c697a78f5c09dc3811326e2271ca Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-25 01:41:17 +00:00
}
void tst_QQuickPathView::consecutiveModelChanges()
{
QFETCH(QQuickPathView::HighlightRangeMode, mode);
QFETCH(QList<ListChange>, changes);
QFETCH(int, count);
QFETCH(qreal, offset);
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
QFETCH(int, currentIndex);
Fix PathView not updating after all items are removed from the model. Always clear the layoutScheduled flag on a refill even if there are no items to create, otherwise future layouts won't be scheduled because it appears one is already pending. Fixes an issue in the dragselection example where items that should have moved to the PathView instead disappeared. Change-Id: I4302b5b43184c697a78f5c09dc3811326e2271ca Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-25 01:41:17 +00:00
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->show();
Fix PathView not updating after all items are removed from the model. Always clear the layoutScheduled flag on a refill even if there are no items to create, otherwise future layouts won't be scheduled because it appears one is already pending. Fixes an issue in the dragselection example where items that should have moved to the PathView instead disappeared. Change-Id: I4302b5b43184c697a78f5c09dc3811326e2271ca Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-25 01:41:17 +00:00
QaimModel model;
model.addItem("Ben", "12345");
model.addItem("Bohn", "2345");
model.addItem("Bob", "54321");
model.addItem("Bill", "4321");
model.addItem("Jinny", "679");
model.addItem("Milly", "73378");
model.addItem("Jimmy", "3535");
model.addItem("Barb", "9039");
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQmlContext *ctxt = window->rootContext();
Fix PathView not updating after all items are removed from the model. Always clear the layoutScheduled flag on a refill even if there are no items to create, otherwise future layouts won't be scheduled because it appears one is already pending. Fixes an issue in the dragselection example where items that should have moved to the PathView instead disappeared. Change-Id: I4302b5b43184c697a78f5c09dc3811326e2271ca Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-25 01:41:17 +00:00
ctxt->setContextProperty("testModel", &model);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->setSource(testFileUrl("pathview0.qml"));
Fix PathView not updating after all items are removed from the model. Always clear the layoutScheduled flag on a refill even if there are no items to create, otherwise future layouts won't be scheduled because it appears one is already pending. Fixes an issue in the dragselection example where items that should have moved to the PathView instead disappeared. Change-Id: I4302b5b43184c697a78f5c09dc3811326e2271ca Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-25 01:41:17 +00:00
qApp->processEvents();
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathview = findItem<QQuickPathView>(window->rootObject(), "view");
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Fix PathView not updating after all items are removed from the model. Always clear the layoutScheduled flag on a refill even if there are no items to create, otherwise future layouts won't be scheduled because it appears one is already pending. Fixes an issue in the dragselection example where items that should have moved to the PathView instead disappeared. Change-Id: I4302b5b43184c697a78f5c09dc3811326e2271ca Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-25 01:41:17 +00:00
pathview->setHighlightRangeMode(mode);
pathview->setCurrentIndex(4);
if (mode == QQuickPathView::StrictlyEnforceRange)
QTRY_COMPARE(pathview->offset(), 4.0);
else
pathview->setOffset(4);
for (int i=0; i<changes.count(); i++) {
switch (changes[i].type) {
case ListChange::Inserted:
{
QList<QPair<QString, QString> > items;
for (int j=changes[i].index; j<changes[i].index + changes[i].count; ++j)
items << qMakePair(QString("new item %1").arg(j), QString::number(j));
model.insertItems(changes[i].index, items);
break;
}
case ListChange::Removed:
model.removeItems(changes[i].index, changes[i].count);
break;
case ListChange::Moved:
model.moveItems(changes[i].index, changes[i].to, changes[i].count);
break;
case ListChange::SetCurrent:
pathview->setCurrentIndex(changes[i].index);
break;
case ListChange::Polish:
tests/auto/quick: remove QQUICK_VERIFY_POLISH macro QQuickTest::qWaitForItemPolished() can be used instead now. Change-Id: I5b531d811271024c750c669c4013865514b2ebeb Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
2018-10-24 08:06:18 +00:00
QQuickTest::qWaitForItemPolished(pathview);
Fix PathView not updating after all items are removed from the model. Always clear the layoutScheduled flag on a refill even if there are no items to create, otherwise future layouts won't be scheduled because it appears one is already pending. Fixes an issue in the dragselection example where items that should have moved to the PathView instead disappeared. Change-Id: I4302b5b43184c697a78f5c09dc3811326e2271ca Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-25 01:41:17 +00:00
break;
default:
continue;
}
}
tests/auto/quick: remove QQUICK_VERIFY_POLISH macro QQuickTest::qWaitForItemPolished() can be used instead now. Change-Id: I5b531d811271024c750c669c4013865514b2ebeb Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
2018-10-24 08:06:18 +00:00
QQuickTest::qWaitForItemPolished(pathview);
Fix PathView not updating after all items are removed from the model. Always clear the layoutScheduled flag on a refill even if there are no items to create, otherwise future layouts won't be scheduled because it appears one is already pending. Fixes an issue in the dragselection example where items that should have moved to the PathView instead disappeared. Change-Id: I4302b5b43184c697a78f5c09dc3811326e2271ca Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-25 01:41:17 +00:00
QCOMPARE(findItems<QQuickItem>(pathview, "wrapper").count(), count);
QCOMPARE(pathview->count(), count);
QTRY_COMPARE(pathview->offset(), offset);
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
QCOMPARE(pathview->currentIndex(), currentIndex);
Fix PathView not updating after all items are removed from the model. Always clear the layoutScheduled flag on a refill even if there are no items to create, otherwise future layouts won't be scheduled because it appears one is already pending. Fixes an issue in the dragselection example where items that should have moved to the PathView instead disappeared. Change-Id: I4302b5b43184c697a78f5c09dc3811326e2271ca Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-25 01:41:17 +00:00
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::path()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQmlEngine engine;
QQmlComponent c(&engine, testFileUrl("pathtest.qml"));
QQuickPath *obj = qobject_cast<QQuickPath*>(c.create());
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(obj != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(obj->startX(), 120.);
QCOMPARE(obj->startY(), 100.);
QVERIFY(obj->path() != QPainterPath());
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQmlListReference list(obj, "pathElements");
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(list.count(), 5);
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQuickPathAttribute* attr = qobject_cast<QQuickPathAttribute*>(list.at(0));
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(attr != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(attr->name(), QString("scale"));
QCOMPARE(attr->value(), 1.0);
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQuickPathQuad* quad = qobject_cast<QQuickPathQuad*>(list.at(1));
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(quad != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(quad->x(), 120.);
QCOMPARE(quad->y(), 25.);
QCOMPARE(quad->controlX(), 260.);
QCOMPARE(quad->controlY(), 75.);
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQuickPathPercent* perc = qobject_cast<QQuickPathPercent*>(list.at(2));
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(perc != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(perc->value(), 0.3);
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQuickPathLine* line = qobject_cast<QQuickPathLine*>(list.at(3));
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(line != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(line->x(), 120.);
QCOMPARE(line->y(), 100.);
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQuickPathCubic* cubic = qobject_cast<QQuickPathCubic*>(list.at(4));
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(cubic != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(cubic->x(), 180.);
QCOMPARE(cubic->y(), 0.);
QCOMPARE(cubic->control1X(), -10.);
QCOMPARE(cubic->control1Y(), 90.);
QCOMPARE(cubic->control2X(), 210.);
QCOMPARE(cubic->control2Y(), 90.);
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
delete obj;
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::dataModel()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Skip tests that are currently asserting on macOS Task-number: QTBUG-68047 Change-Id: Ia75d0db01b89fea87ba23a3144d88bef663cd3d6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-05-02 09:41:37 +00:00
#ifdef Q_OS_MACOS
QSKIP("this test currently crashes on MacOS. See QTBUG-68047");
#endif
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->show();
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQmlContext *ctxt = window->rootContext();
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
TestObject *testObject = new TestObject;
ctxt->setContextProperty("testObject", testObject);
Separate out some of the common test code Moves findItem, findItems() etc. into shared/visualtestutil.h and moves duplicate list model test classes and other common view-specific code into shared/viewtestutil.h. Change-Id: Ia79bc4df1ab7fb618597755c0288a2e8f5054faf Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-01-31 07:15:00 +00:00
QaimModel model;
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
model.addItem("red", "1");
model.addItem("green", "2");
model.addItem("blue", "3");
model.addItem("purple", "4");
model.addItem("gray", "5");
model.addItem("brown", "6");
model.addItem("yellow", "7");
model.addItem("thistle", "8");
model.addItem("cyan", "9");
model.addItem("peachpuff", "10");
model.addItem("powderblue", "11");
model.addItem("gold", "12");
model.addItem("sandybrown", "13");
ctxt->setContextProperty("testData", &model);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->setSource(testFileUrl("datamodel.qml"));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
qApp->processEvents();
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QMetaObject::invokeMethod(window->rootObject(), "checkProperties");
Tests: Replace Q[TRY]_VERIFY(v == true|false) by QVERIFY(v)|QVERIFY(!v). Preparing the replacement of Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) for non-boolean types. Change-Id: I8a4e44a2b4e20a9c8b811799e3932c8ce1a2cbbb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-07-24 11:39:05 +00:00
QVERIFY(!testObject->error());
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickItem *item = findItem<QQuickItem>(pathview, "wrapper", 0);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(item);
QCOMPARE(item->x(), 110.0);
QCOMPARE(item->y(), 10.0);
model.insertItem(4, "orange", "10");
QTest::qWait(100);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QCOMPARE(window->rootObject()->property("viewCount").toInt(), model.count());
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QTRY_COMPARE(findItems<QQuickItem>(pathview, "wrapper").count(), 14);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
tst_qquickpathview: Use QCOMPARE instead of QVERIFY. Attempting to get some diagnostic output for the failues. Task-number: QTBUG-35705 Change-Id: Iffebae89743c31e88125c0b1e21be172d3373b05 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2013-12-18 11:07:38 +00:00
QCOMPARE(pathview->currentIndex(), 0);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QCOMPARE(pathview->currentItem(), findItem<QQuickItem>(pathview, "wrapper", 0));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickText *text = findItem<QQuickText>(pathview, "myText", 4);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(text);
QCOMPARE(text->text(), model.name(4));
model.removeItem(2);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QCOMPARE(window->rootObject()->property("viewCount").toInt(), model.count());
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
text = findItem<QQuickText>(pathview, "myText", 2);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(text);
QCOMPARE(text->text(), model.name(2));
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QCOMPARE(pathview->currentItem(), findItem<QQuickItem>(pathview, "wrapper", 0));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
testObject->setPathItemCount(5);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QMetaObject::invokeMethod(window->rootObject(), "checkProperties");
Tests: Replace Q[TRY]_VERIFY(v == true|false) by QVERIFY(v)|QVERIFY(!v). Preparing the replacement of Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) for non-boolean types. Change-Id: I8a4e44a2b4e20a9c8b811799e3932c8ce1a2cbbb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-07-24 11:39:05 +00:00
QVERIFY(!testObject->error());
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QTRY_COMPARE(findItems<QQuickItem>(pathview, "wrapper").count(), 5);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickRectangle *testItem = findItem<QQuickRectangle>(pathview, "wrapper", 4);
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(testItem != nullptr);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
testItem = findItem<QQuickRectangle>(pathview, "wrapper", 5);
tests/quick: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: Ib9f4c2486af23c47990be4b9e004b965de226dcc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-07-24 13:32:22 +00:00
QVERIFY(!testItem);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
pathview->setCurrentIndex(1);
Stabilize tst_QQuickPathView:dataModel() - QQuickPathView::setCurrentIndex() result must be immediate => no need for random QTest::qWait(100) there. - Remove another random QTest::qWait(100) after inserting a model item. Instead, wait for the desired result ie. delegate creation with QTRY_VERIFY(). - Furthermore, disable the default highlight move duration to avoid the auto test and QQuickPathView's internal timeline fighting over the current index. Task-number: QTBUG-35705 Change-Id: Ie53fdcc8f7955a03027da38b075e6042a3aea7f2 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2014-03-05 19:25:14 +00:00
QCOMPARE(pathview->currentIndex(), 1);
QCOMPARE(pathview->currentItem(), findItem<QQuickItem>(pathview, "wrapper", 1));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
model.insertItem(2, "pink", "2");
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QTRY_COMPARE(findItems<QQuickItem>(pathview, "wrapper").count(), 5);
tst_qquickpathview: Use QCOMPARE instead of QVERIFY. Attempting to get some diagnostic output for the failues. Task-number: QTBUG-35705 Change-Id: Iffebae89743c31e88125c0b1e21be172d3373b05 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2013-12-18 11:07:38 +00:00
QCOMPARE(pathview->currentIndex(), 1);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QCOMPARE(pathview->currentItem(), findItem<QQuickItem>(pathview, "wrapper", 1));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
Stabilize tst_QQuickPathView:dataModel() - QQuickPathView::setCurrentIndex() result must be immediate => no need for random QTest::qWait(100) there. - Remove another random QTest::qWait(100) after inserting a model item. Instead, wait for the desired result ie. delegate creation with QTRY_VERIFY(). - Furthermore, disable the default highlight move duration to avoid the auto test and QQuickPathView's internal timeline fighting over the current index. Task-number: QTBUG-35705 Change-Id: Ie53fdcc8f7955a03027da38b075e6042a3aea7f2 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2014-03-05 19:25:14 +00:00
QTRY_VERIFY(text = findItem<QQuickText>(pathview, "myText", 2));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(text->text(), model.name(2));
model.removeItem(3);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QTRY_COMPARE(findItems<QQuickItem>(pathview, "wrapper").count(), 5);
text = findItem<QQuickText>(pathview, "myText", 3);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(text);
QCOMPARE(text->text(), model.name(3));
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QCOMPARE(pathview->currentItem(), findItem<QQuickItem>(pathview, "wrapper", 1));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
model.moveItem(3, 5);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QTRY_COMPARE(findItems<QQuickItem>(pathview, "wrapper").count(), 5);
QList<QQuickItem*> items = findItems<QQuickItem>(pathview, "wrapper");
foreach (QQuickItem *item, items) {
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(item->property("onPath").toBool());
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QCOMPARE(pathview->currentItem(), findItem<QQuickItem>(pathview, "wrapper", 1));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
// QTBUG-14199
pathview->setOffset(7);
pathview->setOffset(0);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QCOMPARE(findItems<QQuickItem>(pathview, "wrapper").count(), 5);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
pathview->setCurrentIndex(model.count()-1);
Changing PathView offset doesn't set currentIndex appropriately If the highlightRangeMode is StrictlyEnforceRange then the currentIndex should always be updated when the path offset changes. Task-number: QTBUG-19835 Change-Id: I2371e5abd430e770bbb8f9f9d5f4e1d17e0d8ff5 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2012-06-27 04:05:38 +00:00
QTRY_COMPARE(pathview->offset(), 1.0);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
model.removeItem(model.count()-1);
QCOMPARE(pathview->currentIndex(), model.count()-1);
delete testObject;
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::pathMoved()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->show();
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
Separate out some of the common test code Moves findItem, findItems() etc. into shared/visualtestutil.h and moves duplicate list model test classes and other common view-specific code into shared/viewtestutil.h. Change-Id: Ia79bc4df1ab7fb618597755c0288a2e8f5054faf Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-01-31 07:15:00 +00:00
QaimModel model;
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
model.addItem("Ben", "12345");
model.addItem("Bohn", "2345");
model.addItem("Bob", "54321");
model.addItem("Bill", "4321");
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQmlContext *ctxt = window->rootContext();
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
ctxt->setContextProperty("testModel", &model);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->setSource(testFileUrl("pathview0.qml"));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
qApp->processEvents();
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathview = findItem<QQuickPathView>(window->rootObject(), "view");
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickRectangle *firstItem = findItem<QQuickRectangle>(pathview, "wrapper", 0);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(firstItem);
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path());
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(path);
Expose QQuickPath::pointAtPercent as Q_INVOKABLE So it can be used in QML. Useful in combination with ShapePath, in order to add graphics along a Shape. [ChangeLog][QtQuick][Shapes] Exposed QQuickPath::pointAtPercent as invokable in QML. Change-Id: Ia8aeb2b74003410ce16d9d2a0c62d79a021530af Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-05-27 21:36:31 +00:00
QPointF start = path->pointAtPercent(0.0);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QPointF offset;//Center of item is at point, but pos is from corner
offset.setX(firstItem->width()/2);
offset.setY(firstItem->height()/2);
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QTRY_COMPARE(firstItem->position() + offset, start);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
pathview->setOffset(1.0);
Fix coding style issues Avoid Qt Sanity Bot noise when these files are moved. Change-Id: I714e949837909883fe7e387ae336d2ffc4a1912b Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-17 11:03:58 +00:00
for (int i=0; i<model.count(); i++) {
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickRectangle *curItem = findItem<QQuickRectangle>(pathview, "wrapper", i);
Expose QQuickPath::pointAtPercent as Q_INVOKABLE So it can be used in QML. Useful in combination with ShapePath, in order to add graphics along a Shape. [ChangeLog][QtQuick][Shapes] Exposed QQuickPath::pointAtPercent as invokable in QML. Change-Id: Ia8aeb2b74003410ce16d9d2a0c62d79a021530af Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-05-27 21:36:31 +00:00
QPointF itemPos(path->pointAtPercent(0.25 + i*0.25));
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QCOMPARE(curItem->position() + offset, QPointF(itemPos.x(), itemPos.y()));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
}
Changing PathView offset doesn't set currentIndex appropriately If the highlightRangeMode is StrictlyEnforceRange then the currentIndex should always be updated when the path offset changes. Task-number: QTBUG-19835 Change-Id: I2371e5abd430e770bbb8f9f9d5f4e1d17e0d8ff5 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2012-06-27 04:05:38 +00:00
QCOMPARE(pathview->currentIndex(), 3);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
pathview->setOffset(0.0);
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QCOMPARE(firstItem->position() + offset, start);
Changing PathView offset doesn't set currentIndex appropriately If the highlightRangeMode is StrictlyEnforceRange then the currentIndex should always be updated when the path offset changes. Task-number: QTBUG-19835 Change-Id: I2371e5abd430e770bbb8f9f9d5f4e1d17e0d8ff5 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2012-06-27 04:05:38 +00:00
QCOMPARE(pathview->currentIndex(), 0);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
// Change delegate size
pathview->setOffset(0.1);
pathview->setOffset(0.0);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->rootObject()->setProperty("delegateWidth", 30);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(firstItem->width(), 30.0);
offset.setX(firstItem->width()/2);
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QTRY_COMPARE(firstItem->position() + offset, start);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
// Change delegate scale
pathview->setOffset(0.1);
pathview->setOffset(0.0);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->rootObject()->setProperty("delegateScale", 1.2);
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QTRY_COMPARE(firstItem->position() + offset, start);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
}
Changing PathView offset doesn't set currentIndex appropriately If the highlightRangeMode is StrictlyEnforceRange then the currentIndex should always be updated when the path offset changes. Task-number: QTBUG-19835 Change-Id: I2371e5abd430e770bbb8f9f9d5f4e1d17e0d8ff5 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2012-06-27 04:05:38 +00:00
void tst_QQuickPathView::offset_data()
{
QTest::addColumn<qreal>("offset");
QTest::addColumn<int>("currentIndex");
QTest::newRow("0.0") << 0.0 << 0;
QTest::newRow("1.0") << 7.0 << 1;
QTest::newRow("5.0") << 5.0 << 3;
QTest::newRow("4.6") << 4.6 << 3;
QTest::newRow("4.4") << 4.4 << 4;
QTest::newRow("5.4") << 5.4 << 3;
QTest::newRow("5.6") << 5.6 << 2;
}
void tst_QQuickPathView::offset()
{
QFETCH(qreal, offset);
QFETCH(int, currentIndex);
QQmlEngine engine;
QQmlComponent c(&engine, testFileUrl("pathview3.qml"));
QQuickPathView *view = qobject_cast<QQuickPathView*>(c.create());
view->setOffset(offset);
QCOMPARE(view->currentIndex(), currentIndex);
delete view;
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::setCurrentIndex()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->show();
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
Separate out some of the common test code Moves findItem, findItems() etc. into shared/visualtestutil.h and moves duplicate list model test classes and other common view-specific code into shared/viewtestutil.h. Change-Id: Ia79bc4df1ab7fb618597755c0288a2e8f5054faf Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-01-31 07:15:00 +00:00
QaimModel model;
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
model.addItem("Ben", "12345");
model.addItem("Bohn", "2345");
model.addItem("Bob", "54321");
model.addItem("Bill", "4321");
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQmlContext *ctxt = window->rootContext();
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
ctxt->setContextProperty("testModel", &model);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->setSource(testFileUrl("pathview0.qml"));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
qApp->processEvents();
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathview = findItem<QQuickPathView>(window->rootObject(), "view");
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickRectangle *firstItem = findItem<QQuickRectangle>(pathview, "wrapper", 0);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(firstItem);
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path());
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(path);
Expose QQuickPath::pointAtPercent as Q_INVOKABLE So it can be used in QML. Useful in combination with ShapePath, in order to add graphics along a Shape. [ChangeLog][QtQuick][Shapes] Exposed QQuickPath::pointAtPercent as invokable in QML. Change-Id: Ia8aeb2b74003410ce16d9d2a0c62d79a021530af Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-05-27 21:36:31 +00:00
QPointF start = path->pointAtPercent(0.0);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QPointF offset;//Center of item is at point, but pos is from corner
offset.setX(firstItem->width()/2);
offset.setY(firstItem->height()/2);
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QCOMPARE(firstItem->position() + offset, start);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QCOMPARE(window->rootObject()->property("currentA").toInt(), 0);
QCOMPARE(window->rootObject()->property("currentB").toInt(), 0);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
pathview->setCurrentIndex(2);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
firstItem = findItem<QQuickRectangle>(pathview, "wrapper", 2);
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QTRY_COMPARE(firstItem->position() + offset, start);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QCOMPARE(window->rootObject()->property("currentA").toInt(), 2);
QCOMPARE(window->rootObject()->property("currentB").toInt(), 2);
Add a currentItem property to PathView. Task-number: QTBUG-16347 Change-Id: I6df4b2d7c5f325e84d54ed5befd66e20b64cc7e0 Reviewed-on: http://codereview.qt.nokia.com/2421 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-08-01 03:09:10 +00:00
QCOMPARE(pathview->currentItem(), firstItem);
QCOMPARE(firstItem->property("onPath"), QVariant(true));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
pathview->decrementCurrentIndex();
QTRY_COMPARE(pathview->currentIndex(), 1);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
firstItem = findItem<QQuickRectangle>(pathview, "wrapper", 1);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(firstItem);
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QTRY_COMPARE(firstItem->position() + offset, start);
Add a currentItem property to PathView. Task-number: QTBUG-16347 Change-Id: I6df4b2d7c5f325e84d54ed5befd66e20b64cc7e0 Reviewed-on: http://codereview.qt.nokia.com/2421 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-08-01 03:09:10 +00:00
QCOMPARE(pathview->currentItem(), firstItem);
QCOMPARE(firstItem->property("onPath"), QVariant(true));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
pathview->decrementCurrentIndex();
QTRY_COMPARE(pathview->currentIndex(), 0);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
firstItem = findItem<QQuickRectangle>(pathview, "wrapper", 0);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(firstItem);
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QTRY_COMPARE(firstItem->position() + offset, start);
Add a currentItem property to PathView. Task-number: QTBUG-16347 Change-Id: I6df4b2d7c5f325e84d54ed5befd66e20b64cc7e0 Reviewed-on: http://codereview.qt.nokia.com/2421 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-08-01 03:09:10 +00:00
QCOMPARE(pathview->currentItem(), firstItem);
QCOMPARE(firstItem->property("onPath"), QVariant(true));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
pathview->decrementCurrentIndex();
QTRY_COMPARE(pathview->currentIndex(), 3);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
firstItem = findItem<QQuickRectangle>(pathview, "wrapper", 3);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(firstItem);
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QTRY_COMPARE(firstItem->position() + offset, start);
Add a currentItem property to PathView. Task-number: QTBUG-16347 Change-Id: I6df4b2d7c5f325e84d54ed5befd66e20b64cc7e0 Reviewed-on: http://codereview.qt.nokia.com/2421 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-08-01 03:09:10 +00:00
QCOMPARE(pathview->currentItem(), firstItem);
QCOMPARE(firstItem->property("onPath"), QVariant(true));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
pathview->incrementCurrentIndex();
QTRY_COMPARE(pathview->currentIndex(), 0);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
firstItem = findItem<QQuickRectangle>(pathview, "wrapper", 0);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(firstItem);
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QTRY_COMPARE(firstItem->position() + offset, start);
Add a currentItem property to PathView. Task-number: QTBUG-16347 Change-Id: I6df4b2d7c5f325e84d54ed5befd66e20b64cc7e0 Reviewed-on: http://codereview.qt.nokia.com/2421 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-08-01 03:09:10 +00:00
QCOMPARE(pathview->currentItem(), firstItem);
QCOMPARE(firstItem->property("onPath"), QVariant(true));
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
// Test positive indexes are wrapped.
pathview->setCurrentIndex(6);
QTRY_COMPARE(pathview->currentIndex(), 2);
firstItem = findItem<QQuickRectangle>(pathview, "wrapper", 2);
QVERIFY(firstItem);
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QTRY_COMPARE(firstItem->position() + offset, start);
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
QCOMPARE(pathview->currentItem(), firstItem);
QCOMPARE(firstItem->property("onPath"), QVariant(true));
// Test negative indexes are wrapped.
pathview->setCurrentIndex(-3);
QTRY_COMPARE(pathview->currentIndex(), 1);
firstItem = findItem<QQuickRectangle>(pathview, "wrapper", 1);
QVERIFY(firstItem);
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QTRY_COMPARE(firstItem->position() + offset, start);
Reset the PathView currentIndex to 0 when all items are removed. The default currentIndex for an empty PathView is 0, and except when there is no model or an empty model setCurrentIndex won't allow a currentIndex outside the valid index range for the model. This changes the wrapping for negative numbers in setCurrentIndex so that it is consistent with decrementCurrentIndex and forces the currentIndex to 0 if there are no model items. Task-number: QTBUG-21316 Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-05-29 05:45:15 +00:00
QCOMPARE(pathview->currentItem(), firstItem);
QCOMPARE(firstItem->property("onPath"), QVariant(true));
Move path with highlightMoveDuration: 0 Task-number: QTBUG-22786 Change-Id: I10043bfa5d8c622fc4e7a25bcb1f96ef43d23890 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-21 23:28:40 +00:00
// move an item, set move duration to 0, and change currentIndex to moved item. QTBUG-22786
model.moveItem(0, 3);
pathview->setHighlightMoveDuration(0);
pathview->setCurrentIndex(3);
QCOMPARE(pathview->currentIndex(), 3);
firstItem = findItem<QQuickRectangle>(pathview, "wrapper", 3);
QVERIFY(firstItem);
QCOMPARE(pathview->currentItem(), firstItem);
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QTRY_COMPARE(firstItem->position() + offset, start);
Move path with highlightMoveDuration: 0 Task-number: QTBUG-22786 Change-Id: I10043bfa5d8c622fc4e7a25bcb1f96ef43d23890 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-21 23:28:40 +00:00
model.moveItem(3, 0);
pathview->setCurrentIndex(0);
pathview->setHighlightMoveDuration(300);
Add a currentItem property to PathView. Task-number: QTBUG-16347 Change-Id: I6df4b2d7c5f325e84d54ed5befd66e20b64cc7e0 Reviewed-on: http://codereview.qt.nokia.com/2421 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-08-01 03:09:10 +00:00
// Check the current item is still created when outside the bounds of pathItemCount.
pathview->setPathItemCount(2);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
pathview->setHighlightRangeMode(QQuickPathView::NoHighlightRange);
QVERIFY(findItem<QQuickRectangle>(pathview, "wrapper", 0));
QVERIFY(findItem<QQuickRectangle>(pathview, "wrapper", 1));
QVERIFY(!findItem<QQuickRectangle>(pathview, "wrapper", 2));
QVERIFY(!findItem<QQuickRectangle>(pathview, "wrapper", 3));
Add a currentItem property to PathView. Task-number: QTBUG-16347 Change-Id: I6df4b2d7c5f325e84d54ed5befd66e20b64cc7e0 Reviewed-on: http://codereview.qt.nokia.com/2421 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-08-01 03:09:10 +00:00
pathview->setCurrentIndex(2);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
firstItem = findItem<QQuickRectangle>(pathview, "wrapper", 2);
Add a currentItem property to PathView. Task-number: QTBUG-16347 Change-Id: I6df4b2d7c5f325e84d54ed5befd66e20b64cc7e0 Reviewed-on: http://codereview.qt.nokia.com/2421 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-08-01 03:09:10 +00:00
QCOMPARE(pathview->currentItem(), firstItem);
QCOMPARE(firstItem->property("onPath"), QVariant(false));
pathview->decrementCurrentIndex();
QTRY_COMPARE(pathview->currentIndex(), 1);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
firstItem = findItem<QQuickRectangle>(pathview, "wrapper", 1);
Add a currentItem property to PathView. Task-number: QTBUG-16347 Change-Id: I6df4b2d7c5f325e84d54ed5befd66e20b64cc7e0 Reviewed-on: http://codereview.qt.nokia.com/2421 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-08-01 03:09:10 +00:00
QVERIFY(firstItem);
QCOMPARE(pathview->currentItem(), firstItem);
QCOMPARE(firstItem->property("onPath"), QVariant(true));
pathview->decrementCurrentIndex();
QTRY_COMPARE(pathview->currentIndex(), 0);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
firstItem = findItem<QQuickRectangle>(pathview, "wrapper", 0);
Add a currentItem property to PathView. Task-number: QTBUG-16347 Change-Id: I6df4b2d7c5f325e84d54ed5befd66e20b64cc7e0 Reviewed-on: http://codereview.qt.nokia.com/2421 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-08-01 03:09:10 +00:00
QVERIFY(firstItem);
QCOMPARE(pathview->currentItem(), firstItem);
QCOMPARE(firstItem->property("onPath"), QVariant(true));
pathview->decrementCurrentIndex();
QTRY_COMPARE(pathview->currentIndex(), 3);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
firstItem = findItem<QQuickRectangle>(pathview, "wrapper", 3);
Add a currentItem property to PathView. Task-number: QTBUG-16347 Change-Id: I6df4b2d7c5f325e84d54ed5befd66e20b64cc7e0 Reviewed-on: http://codereview.qt.nokia.com/2421 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-08-01 03:09:10 +00:00
QVERIFY(firstItem);
QCOMPARE(pathview->currentItem(), firstItem);
QCOMPARE(firstItem->property("onPath"), QVariant(false));
pathview->incrementCurrentIndex();
QTRY_COMPARE(pathview->currentIndex(), 0);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
firstItem = findItem<QQuickRectangle>(pathview, "wrapper", 0);
Add a currentItem property to PathView. Task-number: QTBUG-16347 Change-Id: I6df4b2d7c5f325e84d54ed5befd66e20b64cc7e0 Reviewed-on: http://codereview.qt.nokia.com/2421 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-08-01 03:09:10 +00:00
QVERIFY(firstItem);
QCOMPARE(pathview->currentItem(), firstItem);
QCOMPARE(firstItem->property("onPath"), QVariant(true));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
Fix QQuickPathViewPrivate::snapToIndex() QQuickPathView::setCurrentIndex() set moveReason to "SetIndex", but snapToIndex() overrode it to "Other". This caused updateCurrent() to change the current index during snap animation and caused binding loops in Qt Quick Controls 2. Change-Id: I6c5f34c69886cb5c234ed78535bb356fbb38b3a6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-10-21 15:04:16 +00:00
// check for bogus currentIndexChanged() signals
QSignalSpy currentIndexSpy(pathview, SIGNAL(currentIndexChanged()));
QVERIFY(currentIndexSpy.isValid());
pathview->setHighlightMoveDuration(100);
pathview->setHighlightRangeMode(QQuickPathView::StrictlyEnforceRange);
pathview->setSnapMode(QQuickPathView::SnapToItem);
pathview->setCurrentIndex(3);
QTRY_COMPARE(pathview->currentIndex(), 3);
QCOMPARE(currentIndexSpy.count(), 1);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
}
Fix incorrect PathView.currentIndex assignment with StrictlyEnforceRange If currentIndex is quickly assigned a different index and then the previous current index again, it should not move. Fixes: QTBUG-74508 Change-Id: I8d610e3fe452c8631e082c648e77d2cb70ae57c5 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-03-21 13:36:57 +00:00
void tst_QQuickPathView::setCurrentIndexWrap()
{
QScopedPointer<QQuickView> window(createView());
window->setSource(testFileUrl("pathview5.qml"));
window->show();
qApp->processEvents();
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
QVERIFY(pathview);
// set current index to last item
pathview->setCurrentIndex(4);
// set currentIndex to first item, then quickly set it back (QTBUG-74508)
QSignalSpy currentIndexSpy(pathview, SIGNAL(currentIndexChanged()));
QSignalSpy movementStartedSpy(pathview, SIGNAL(movementStarted()));
pathview->setCurrentIndex(0);
pathview->setCurrentIndex(4);
QCOMPARE(pathview->currentIndex(), 4);
QCOMPARE(currentIndexSpy.count(), 2);
QCOMPARE(movementStartedSpy.count(), 0);
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::resetModel()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QStringList strings;
strings << "one" << "two" << "three";
QStringListModel model(strings);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQmlContext *ctxt = window->rootContext();
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
ctxt->setContextProperty("testModel", &model);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->setSource(testFileUrl("displaypath.qml"));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
qApp->processEvents();
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathview = findItem<QQuickPathView>(window->rootObject(), "view");
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(pathview->count(), model.rowCount());
for (int i = 0; i < model.rowCount(); ++i) {
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickText *display = findItem<QQuickText>(pathview, "displayText", i);
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(display != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(display->text(), strings.at(i));
}
strings.clear();
strings << "four" << "five" << "six" << "seven";
model.setStringList(strings);
QCOMPARE(pathview->count(), model.rowCount());
for (int i = 0; i < model.rowCount(); ++i) {
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickText *display = findItem<QQuickText>(pathview, "displayText", i);
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(display != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(display->text(), strings.at(i));
}
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::propertyChanges()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QVERIFY(window);
window->setSource(testFileUrl("propertychanges.qml"));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathView = window->rootObject()->findChild<QQuickPathView*>("pathView");
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(pathView);
QSignalSpy snapPositionSpy(pathView, SIGNAL(preferredHighlightBeginChanged()));
QSignalSpy dragMarginSpy(pathView, SIGNAL(dragMarginChanged()));
QCOMPARE(pathView->preferredHighlightBegin(), 0.1);
QCOMPARE(pathView->dragMargin(), 5.0);
pathView->setPreferredHighlightBegin(0.4);
pathView->setPreferredHighlightEnd(0.4);
pathView->setDragMargin(20.0);
QCOMPARE(pathView->preferredHighlightBegin(), 0.4);
QCOMPARE(pathView->preferredHighlightEnd(), 0.4);
QCOMPARE(pathView->dragMargin(), 20.0);
QCOMPARE(snapPositionSpy.count(), 1);
QCOMPARE(dragMarginSpy.count(), 1);
pathView->setPreferredHighlightBegin(0.4);
pathView->setPreferredHighlightEnd(0.4);
pathView->setDragMargin(20.0);
QCOMPARE(snapPositionSpy.count(), 1);
QCOMPARE(dragMarginSpy.count(), 1);
PathView was missing the maximumFlickVelocity property Change-Id: I0ed4ff0fe169187f7a8e03597be7407e9896100d Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-25 02:37:08 +00:00
QSignalSpy maximumFlickVelocitySpy(pathView, SIGNAL(maximumFlickVelocityChanged()));
pathView->setMaximumFlickVelocity(1000);
QCOMPARE(maximumFlickVelocitySpy.count(), 1);
pathView->setMaximumFlickVelocity(1000);
QCOMPARE(maximumFlickVelocitySpy.count(), 1);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::pathChanges()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QVERIFY(window);
window->setSource(testFileUrl("propertychanges.qml"));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathView = window->rootObject()->findChild<QQuickPathView*>("pathView");
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(pathView);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPath *path = window->rootObject()->findChild<QQuickPath*>("path");
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(path);
QSignalSpy startXSpy(path, SIGNAL(startXChanged()));
QSignalSpy startYSpy(path, SIGNAL(startYChanged()));
QCOMPARE(path->startX(), 220.0);
QCOMPARE(path->startY(), 200.0);
path->setStartX(240.0);
path->setStartY(220.0);
QCOMPARE(path->startX(), 240.0);
QCOMPARE(path->startY(), 220.0);
QCOMPARE(startXSpy.count(),1);
QCOMPARE(startYSpy.count(),1);
path->setStartX(240);
path->setStartY(220);
QCOMPARE(startXSpy.count(),1);
QCOMPARE(startYSpy.count(),1);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPath *alternatePath = window->rootObject()->findChild<QQuickPath*>("alternatePath");
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(alternatePath);
QSignalSpy pathSpy(pathView, SIGNAL(pathChanged()));
QCOMPARE(pathView->path(), path);
pathView->setPath(alternatePath);
QCOMPARE(pathView->path(), alternatePath);
QCOMPARE(pathSpy.count(),1);
pathView->setPath(alternatePath);
QCOMPARE(pathSpy.count(),1);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathAttribute *pathAttribute = window->rootObject()->findChild<QQuickPathAttribute*>("pathAttribute");
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(pathAttribute);
QSignalSpy nameSpy(pathAttribute, SIGNAL(nameChanged()));
QCOMPARE(pathAttribute->name(), QString("opacity"));
pathAttribute->setName("scale");
QCOMPARE(pathAttribute->name(), QString("scale"));
QCOMPARE(nameSpy.count(),1);
pathAttribute->setName("scale");
QCOMPARE(nameSpy.count(),1);
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::componentChanges()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QVERIFY(window);
window->setSource(testFileUrl("propertychanges.qml"));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathView = window->rootObject()->findChild<QQuickPathView*>("pathView");
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(pathView);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQmlComponent delegateComponent(window->engine());
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
delegateComponent.setData("import QtQuick 2.0; Text { text: '<b>Name:</b> ' + name }", QUrl::fromLocalFile(""));
QSignalSpy delegateSpy(pathView, SIGNAL(delegateChanged()));
pathView->setDelegate(&delegateComponent);
QCOMPARE(pathView->delegate(), &delegateComponent);
QCOMPARE(delegateSpy.count(),1);
pathView->setDelegate(&delegateComponent);
QCOMPARE(delegateSpy.count(),1);
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::modelChanges()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QVERIFY(window);
window->setSource(testFileUrl("propertychanges.qml"));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathView = window->rootObject()->findChild<QQuickPathView*>("pathView");
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(pathView);
Changing PathView model after componentComplete should reset position If the model is changed after the component is completed, the offset and currentIndex should be reset to 0. Change-Id: Ie36eb0c17ce6602c6ae15b5ee7aeb8b1a6e7854b Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-18 00:36:17 +00:00
pathView->setCurrentIndex(3);
QTRY_COMPARE(pathView->offset(), 6.0);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
Move ListModel and ListElement to the QtQml import They're already in the QtQml module, but were left in the QtQuick import because they were considered to be of minimal use without QtQuick types. QtQml types are being developed would could make ListModel useful without QtQuick, indicating that they should no longer be considered QtQuick depedent. Change-Id: I31499f2cc23baf4bc70fb451ba164408bed89ff6 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
2013-01-10 22:07:37 +00:00
QQmlListModel *alternateModel = window->rootObject()->findChild<QQmlListModel*>("alternateModel");
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(alternateModel);
Don't cache model data in VisualDataModel. VisualDataModel doesn't have any way to monitor the lifetime of objects cached other than relying on the source model to emit a changed signal. If the model doesn't do this or a pointer property is referenced after an item has been removed from the model then cache can return a stale pointer. This can be avoided by querying the model directly whenever a property is accessed. Task-number: QTBUG-18036 Change-Id: I7688174c2337cb5c0f77eb7d31a01f4aa958071b Reviewed-on: http://codereview.qt.nokia.com/2647 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-08-02 05:19:06 +00:00
QVariant modelVariant = QVariant::fromValue<QObject *>(alternateModel);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QSignalSpy modelSpy(pathView, SIGNAL(modelChanged()));
Changing PathView model after componentComplete should reset position If the model is changed after the component is completed, the offset and currentIndex should be reset to 0. Change-Id: Ie36eb0c17ce6602c6ae15b5ee7aeb8b1a6e7854b Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-18 00:36:17 +00:00
QSignalSpy currentIndexSpy(pathView, SIGNAL(currentIndexChanged()));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
Changing PathView model after componentComplete should reset position If the model is changed after the component is completed, the offset and currentIndex should be reset to 0. Change-Id: Ie36eb0c17ce6602c6ae15b5ee7aeb8b1a6e7854b Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-18 00:36:17 +00:00
QCOMPARE(pathView->currentIndex(), 3);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
pathView->setModel(modelVariant);
QCOMPARE(pathView->model(), modelVariant);
QCOMPARE(modelSpy.count(),1);
Changing PathView model after componentComplete should reset position If the model is changed after the component is completed, the offset and currentIndex should be reset to 0. Change-Id: Ie36eb0c17ce6602c6ae15b5ee7aeb8b1a6e7854b Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-18 00:36:17 +00:00
QCOMPARE(pathView->currentIndex(), 0);
QCOMPARE(currentIndexSpy.count(), 1);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
pathView->setModel(modelVariant);
QCOMPARE(modelSpy.count(),1);
pathView->setModel(QVariant());
QCOMPARE(modelSpy.count(),2);
Changing PathView model after componentComplete should reset position If the model is changed after the component is completed, the offset and currentIndex should be reset to 0. Change-Id: Ie36eb0c17ce6602c6ae15b5ee7aeb8b1a6e7854b Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-18 00:36:17 +00:00
QCOMPARE(pathView->currentIndex(), 0);
QCOMPARE(currentIndexSpy.count(), 1);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::pathUpdateOnStartChanged()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QVERIFY(window);
window->setSource(testFileUrl("pathUpdateOnStartChanged.qml"));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathView = window->rootObject()->findChild<QQuickPathView*>("pathView");
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(pathView);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPath *path = window->rootObject()->findChild<QQuickPath*>("path");
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(path);
QCOMPARE(path->startX(), 400.0);
QCOMPARE(path->startY(), 300.0);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickItem *item = findItem<QQuickItem>(pathView, "wrapper", 0);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(item);
QCOMPARE(item->x(), path->startX() - item->width() / 2.0);
QCOMPARE(item->y(), path->startY() - item->height() / 2.0);
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::package()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QVERIFY(window);
window->setSource(testFileUrl("pathview_package.qml"));
window->show();
All QWindow properties that have "window" in them have been renamed. Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase. Change-Id: I9614cc2c7ed119c663b3f6f99267483e291e529c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-19 16:05:01 +00:00
window->requestActivate();
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QVERIFY(QTest::qWaitForWindowActive(window.data()));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathView = window->rootObject()->findChild<QQuickPathView*>("photoPathView");
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(pathView);
Add tests for item polish bug on Mac On Mac OS X, if a QQuickItem triggers a polish request from Component.onCompleted, its updatePolish() function is not called. The tst_qquickitem::polishOnCompleted() test demonstrates this. If a running animation is added to the polishOnCompleted.qml in the test, the test will pass. Task-number: QTBUG-23481, QTBUG-23480, QTBUG-21590 Change-Id: I172b12e784aa458c43c23e0ee43f034f0bd332ee Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-01-06 04:02:10 +00:00
#ifdef Q_OS_MAC
tst_QQuickPathView::package(): updated QSKIP() QTBUG-21590 has been marked as resolved, but the problem persists. A new bug QTBUG-27170 has been reported and the QSKIP() updated accordingly. Task-number: QTBUG-27170 Change-Id: I91d7df2588d87af833502f6c11d2e6a051e4ebb5 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2012-09-06 12:55:54 +00:00
QSKIP("QTBUG-27170 view does not reliably receive polish without a running animation");
Add tests for item polish bug on Mac On Mac OS X, if a QQuickItem triggers a polish request from Component.onCompleted, its updatePolish() function is not called. The tst_qquickitem::polishOnCompleted() test demonstrates this. If a running animation is added to the polishOnCompleted.qml in the test, the test will pass. Task-number: QTBUG-23481, QTBUG-23480, QTBUG-21590 Change-Id: I172b12e784aa458c43c23e0ee43f034f0bd332ee Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-01-06 04:02:10 +00:00
#endif
Merge remote-tracking branch 'origin/5.12' into dev Conflicts: .qmake.conf tests/auto/quick/qquickpathview/tst_qquickpathview.cpp Change-Id: Ic1f5e219a255d0613f7654368a5ce3eccb8f0ee9
2019-01-22 09:35:09 +00:00
QQuickTest::qWaitForItemPolished(pathView);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickItem *item = findItem<QQuickItem>(pathView, "pathItem");
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(item);
QVERIFY(item->scale() != 1.0);
}
//QTBUG-13017
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::emptyModel()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QStringListModel model;
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQmlContext *ctxt = window->rootContext();
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
ctxt->setContextProperty("emptyModel", &model);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->setSource(testFileUrl("emptymodel.qml"));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
qApp->processEvents();
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(pathview->offset(), qreal(0.0));
}
Fix crash in PathView Change-Id: I259e7af1755ff9615782bbce03fc41ea1957cab3 Task-number: QTBUG-29176 Reviewed-by: Alan Alpert <aalpert@rim.com>
2013-01-17 09:46:45 +00:00
void tst_QQuickPathView::emptyPath()
{
QQuickView *window = createView();
window->setSource(testFileUrl("emptypath.qml"));
qApp->processEvents();
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Fix crash in PathView Change-Id: I259e7af1755ff9615782bbce03fc41ea1957cab3 Task-number: QTBUG-29176 Reviewed-by: Alan Alpert <aalpert@rim.com>
2013-01-17 09:46:45 +00:00
delete window;
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::closed()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQmlEngine engine;
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQmlComponent c(&engine, testFileUrl("openPath.qml"));
QQuickPath *obj = qobject_cast<QQuickPath*>(c.create());
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(obj);
QCOMPARE(obj->isClosed(), false);
delete obj;
}
{
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQmlComponent c(&engine, testFileUrl("closedPath.qml"));
QQuickPath *obj = qobject_cast<QQuickPath*>(c.create());
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(obj);
QCOMPARE(obj->isClosed(), true);
delete obj;
}
}
// QTBUG-14239
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::pathUpdate()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QVERIFY(window);
window->setSource(testFileUrl("pathUpdate.qml"));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathView = window->rootObject()->findChild<QQuickPathView*>("pathView");
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(pathView);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickItem *item = findItem<QQuickItem>(pathView, "wrapper", 0);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(item);
QCOMPARE(item->x(), 150.0);
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::visualDataModel()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQmlEngine engine;
QQmlComponent c(&engine, testFileUrl("vdm.qml"));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickPathView *obj = qobject_cast<QQuickPathView*>(c.create());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(obj != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(obj->count(), 3);
delete obj;
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::undefinedPath()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQmlEngine engine;
Ignore expected warnings in Item and PathView tests Change-Id: I05ebebbfe7f6b107068e9feaf66c03fd3ae71237 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2011-12-06 02:29:09 +00:00
Fix failing tst_QQuickPathView::undefinedPath() Test was failing on Mac because QPainterPath only prints the relevant warnings if QT_NO_DEBUG is not defined, which is not the case for standard builds on Mac. Task-number: QTBUG-23482 Change-Id: Ied4d263a1ce7503b573ecc3c53787dac2b57cc74 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-09 02:55:52 +00:00
// QPainterPath warnings are only received if QT_NO_DEBUG is not defined
if (QLibraryInfo::isDebugBuild()) {
Fix QQuickPathView autotest: update expected warning messages The wording of the warnings were changed in qtbase. Fixes: QTBUG-76152 Change-Id: Iae0dfbcbb699b8abff92b5923b0a5627591043c8 Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-03 08:01:26 +00:00
QRegularExpression warning1("^QPainterPath::moveTo:.*ignoring call$");
QTest::ignoreMessage(QtWarningMsg, warning1);
Ignore expected warnings in Item and PathView tests Change-Id: I05ebebbfe7f6b107068e9feaf66c03fd3ae71237 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2011-12-06 02:29:09 +00:00
Fix QQuickPathView autotest: update expected warning messages The wording of the warnings were changed in qtbase. Fixes: QTBUG-76152 Change-Id: Iae0dfbcbb699b8abff92b5923b0a5627591043c8 Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-03 08:01:26 +00:00
QRegularExpression warning2("^QPainterPath::lineTo:.*ignoring call$");
QTest::ignoreMessage(QtWarningMsg, warning2);
Fix failing tst_QQuickPathView::undefinedPath() Test was failing on Mac because QPainterPath only prints the relevant warnings if QT_NO_DEBUG is not defined, which is not the case for standard builds on Mac. Task-number: QTBUG-23482 Change-Id: Ied4d263a1ce7503b573ecc3c53787dac2b57cc74 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-09 02:55:52 +00:00
}
Ignore expected warnings in Item and PathView tests Change-Id: I05ebebbfe7f6b107068e9feaf66c03fd3ae71237 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2011-12-06 02:29:09 +00:00
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQmlComponent c(&engine, testFileUrl("undefinedpath.qml"));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickPathView *obj = qobject_cast<QQuickPathView*>(c.create());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(obj != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(obj->count(), 3);
delete obj;
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::mouseDrag()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
Stabilize tests using utilities from QQuickViewTestUtil. Change QQuickViewTestUtil::createView() to center the window on the screen to avoid taskbar areas. Add routine to move the mouse away and use that in tests using QQuickViewTestUtil::flick() and other mouse interaction since the mouse cursor can interfere with it. Affected tests: qquickgridview, qquickpathview, qquickflickable, qquicklistview, qquickrepeater and qquickpositioners. Task-number: QTBUG-33017 Change-Id: I540c0efb54a231dcb44c8fd5ad9573a2d4d4b9df Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2013-08-23 11:35:00 +00:00
QQuickViewTestUtil::moveMouseAway(window.data());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->setSource(testFileUrl("dragpath.qml"));
window->show();
All QWindow properties that have "window" in them have been renamed. Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase. Change-Id: I9614cc2c7ed119c663b3f6f99267483e291e529c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-19 16:05:01 +00:00
window->requestActivate();
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QVERIFY(QTest::qWaitForWindowActive(window.data()));
QCOMPARE(window.data(), qGuiApp->focusWindow());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
PathView needs drag events similar to Flickable Added dragging property and dragStarted() and dragEnded() signals. Task-number: QTBUG-21740 Change-Id: I718835ff7e46af615951ec5f248eba41bac31071 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2012-07-03 03:57:54 +00:00
QSignalSpy movingSpy(pathview, SIGNAL(movingChanged()));
QSignalSpy moveStartedSpy(pathview, SIGNAL(movementStarted()));
QSignalSpy moveEndedSpy(pathview, SIGNAL(movementEnded()));
QSignalSpy draggingSpy(pathview, SIGNAL(draggingChanged()));
QSignalSpy dragStartedSpy(pathview, SIGNAL(dragStarted()));
QSignalSpy dragEndedSpy(pathview, SIGNAL(dragEnded()));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
int current = pathview->currentIndex();
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QTest::mousePress(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(10,100));
Fix waiting for active window breakage Use QTRY_COMPARE(view == qGuiApp->focusWindow()); Change-Id: If5934f4355d9eb8da343f98277e3528f56926cd9 Fixes: QTBUG-21682, QTBUG-21683, QTBUG-21687, QTBUG-21680 Reviewed-on: http://codereview.qt-project.org/6087 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2011-10-06 00:10:24 +00:00
QTest::qWait(100);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Stabilize the drag related autotests for higher dpi displays Higher DPI displays might have a larger StartDragDistance (at least on X11), breaking the autotest on these displays. Change-Id: I9768a245a7654665dd9f718100289e9416d8c855 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2015-01-09 09:53:12 +00:00
QMouseEvent mv(QEvent::MouseMove, QPoint(50,100), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QGuiApplication::sendEvent(window.data(), &mv);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
}
PathView was moving view too soon on drag In order to allow gesture grabbing to work correctly, the view shouldn't react to a drag until the event after the one that triggered it. Change-Id: I3b84e501aa0f82da821498fa26abe8bbf66a6252 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-05-14 02:49:52 +00:00
// first move beyond threshold does not trigger drag
QVERIFY(!pathview->isMoving());
PathView needs drag events similar to Flickable Added dragging property and dragStarted() and dragEnded() signals. Task-number: QTBUG-21740 Change-Id: I718835ff7e46af615951ec5f248eba41bac31071 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2012-07-03 03:57:54 +00:00
QVERIFY(!pathview->isDragging());
QCOMPARE(movingSpy.count(), 0);
QCOMPARE(moveStartedSpy.count(), 0);
QCOMPARE(moveEndedSpy.count(), 0);
QCOMPARE(draggingSpy.count(), 0);
QCOMPARE(dragStartedSpy.count(), 0);
QCOMPARE(dragEndedSpy.count(), 0);
PathView was moving view too soon on drag In order to allow gesture grabbing to work correctly, the view shouldn't react to a drag until the event after the one that triggered it. Change-Id: I3b84e501aa0f82da821498fa26abe8bbf66a6252 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-05-14 02:49:52 +00:00
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
QMouseEvent mv(QEvent::MouseMove, QPoint(90,100), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QGuiApplication::sendEvent(window.data(), &mv);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
}
PathView was moving view too soon on drag In order to allow gesture grabbing to work correctly, the view shouldn't react to a drag until the event after the one that triggered it. Change-Id: I3b84e501aa0f82da821498fa26abe8bbf66a6252 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-05-14 02:49:52 +00:00
// next move beyond threshold does trigger drag
tst_QQuickPathView::mouseDrag(): Skip on Windows if drag fails to start. The test can be thrown off by external mouse move events which influence the calculation of the drag distances. It is not clear where they originate from on the CI. FAIL! : tst_QQuickPathView::mouseDrag() 'pathview->isMoving()' returned FALSE. () tst_qquickpathview.cpp(1506) : failure location Change-Id: I398304b5597579033df81e1d0d32b2a3ab5516d6 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2015-02-26 15:20:43 +00:00
#ifdef Q_OS_WIN
if (!pathview->isMoving())
QSKIP("Skipping due to interference from external mouse move events.");
#endif // Q_OS_WIN
PathView was moving view too soon on drag In order to allow gesture grabbing to work correctly, the view shouldn't react to a drag until the event after the one that triggered it. Change-Id: I3b84e501aa0f82da821498fa26abe8bbf66a6252 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-05-14 02:49:52 +00:00
QVERIFY(pathview->isMoving());
PathView needs drag events similar to Flickable Added dragging property and dragStarted() and dragEnded() signals. Task-number: QTBUG-21740 Change-Id: I718835ff7e46af615951ec5f248eba41bac31071 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2012-07-03 03:57:54 +00:00
QVERIFY(pathview->isDragging());
QCOMPARE(movingSpy.count(), 1);
QCOMPARE(moveStartedSpy.count(), 1);
QCOMPARE(moveEndedSpy.count(), 0);
QCOMPARE(draggingSpy.count(), 1);
QCOMPARE(dragStartedSpy.count(), 1);
QCOMPARE(dragEndedSpy.count(), 0);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(pathview->currentIndex() != current);
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(40,100));
PathView needs drag events similar to Flickable Added dragging property and dragStarted() and dragEnded() signals. Task-number: QTBUG-21740 Change-Id: I718835ff7e46af615951ec5f248eba41bac31071 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2012-07-03 03:57:54 +00:00
QVERIFY(!pathview->isDragging());
QCOMPARE(draggingSpy.count(), 2);
QCOMPARE(dragStartedSpy.count(), 1);
QCOMPARE(dragEndedSpy.count(), 1);
QTRY_COMPARE(movingSpy.count(), 2);
QTRY_COMPARE(moveEndedSpy.count(), 1);
QCOMPARE(moveStartedSpy.count(), 1);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
}
Fix PathView stealing mouse grab from its child items. Apply the improvements that have been applied to Flickables handling of child items over time to PathView to bring its behavior back in line. Task-number: QTBUG-33699 Change-Id: I76a412d75c48f9cf2f12f5f6f1aa01ff62d06364 Reviewed-by: Joona Petrell <joona.petrell@jollamobile.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
2013-09-27 04:26:48 +00:00
void tst_QQuickPathView::nestedMouseAreaDrag()
{
QScopedPointer<QQuickView> window(createView());
QQuickViewTestUtil::moveMouseAway(window.data());
window->setSource(testFileUrl("nestedmousearea.qml"));
window->show();
window->requestActivate();
QVERIFY(QTest::qWaitForWindowActive(window.data()));
QCOMPARE(window.data(), qGuiApp->focusWindow());
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Fix PathView stealing mouse grab from its child items. Apply the improvements that have been applied to Flickables handling of child items over time to PathView to bring its behavior back in line. Task-number: QTBUG-33699 Change-Id: I76a412d75c48f9cf2f12f5f6f1aa01ff62d06364 Reviewed-by: Joona Petrell <joona.petrell@jollamobile.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
2013-09-27 04:26:48 +00:00
// Dragging the child mouse area should move it and not animate the PathView
Stabilize the drag related autotests for higher dpi displays Higher DPI displays might have a larger StartDragDistance (at least on X11), breaking the autotest on these displays. Change-Id: I9768a245a7654665dd9f718100289e9416d8c855 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2015-01-09 09:53:12 +00:00
flick(window.data(), QPoint(200,200), QPoint(400,200), 200);
Fix PathView stealing mouse grab from its child items. Apply the improvements that have been applied to Flickables handling of child items over time to PathView to bring its behavior back in line. Task-number: QTBUG-33699 Change-Id: I76a412d75c48f9cf2f12f5f6f1aa01ff62d06364 Reviewed-by: Joona Petrell <joona.petrell@jollamobile.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
2013-09-27 04:26:48 +00:00
QVERIFY(!pathview->isMoving());
// Dragging outside the mouse are should animate the PathView.
flick(window.data(), QPoint(75,75), QPoint(175,75), 200);
QVERIFY(pathview->isMoving());
}
PathView: grab mouse on press if already moving A side effect of 8fd398c9d2f5f54e446e0b402bc63a2edb50da6f is that it became possible for the highlight to stop between items, rather than snapping to a specific item, if the user taps, clicks or drags an additional time while the movement is ongoing. That was because it didn't get a mouse grab, so it missed the release event. QQuickPathViewPrivate::handleMouseReleaseEvent() needs to take care of the snapping behavior after the user stops dragging. This only affects behavior in the case that the PathView is already moving and the mouse is pressed again: we assume the user wants to alter the PathView's velocity, not interact with any delegate inside or with any parent item. Task-number: QTBUG-77173 Task-number: QTBUG-59620 Change-Id: I7b2f69a6ef8d8022d7c917a5bf9e8fb40c8848db Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-09-05 11:57:19 +00:00
void tst_QQuickPathView::flickNClick() // QTBUG-77173
{
QScopedPointer<QQuickView> window(createView());
QQuickViewTestUtil::moveMouseAway(window.data());
window->setSource(testFileUrl("nestedmousearea2.qml"));
window->show();
window->requestActivate();
QVERIFY(QTest::qWaitForWindowActive(window.data()));
QCOMPARE(window.data(), qGuiApp->focusWindow());
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
QVERIFY(pathview != nullptr);
Add signal spies to tst_QQuickPathView::flickNClick test QTBUG-78926 is about failing to emit the movingChanged signal. The test verifies that e2df4233a77ce8a37d2c8ef26b7b42fc0d33a24b fixed it. While we're at it, might as well verify a few more signals in this test scenario where we flick the PathView at various speeds and then stop the flick by clicking. Fixes: QTBUG-78926 Change-Id: I1253dfcd88a63abdbdd280dd9097b484a93cc491 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-10-09 06:25:17 +00:00
QSignalSpy movingChangedSpy(pathview, SIGNAL(movingChanged()));
QSignalSpy draggingSpy(pathview, SIGNAL(draggingChanged()));
QSignalSpy dragStartedSpy(pathview, SIGNAL(dragStarted()));
QSignalSpy dragEndedSpy(pathview, SIGNAL(dragEnded()));
QSignalSpy currentIndexSpy(pathview, SIGNAL(currentIndexChanged()));
QSignalSpy moveStartedSpy(pathview, SIGNAL(movementStarted()));
QSignalSpy moveEndedSpy(pathview, SIGNAL(movementEnded()));
QSignalSpy flickingSpy(pathview, SIGNAL(flickingChanged()));
QSignalSpy flickStartedSpy(pathview, SIGNAL(flickStarted()));
QSignalSpy flickEndedSpy(pathview, SIGNAL(flickEnded()));
PathView: grab mouse on press if already moving A side effect of 8fd398c9d2f5f54e446e0b402bc63a2edb50da6f is that it became possible for the highlight to stop between items, rather than snapping to a specific item, if the user taps, clicks or drags an additional time while the movement is ongoing. That was because it didn't get a mouse grab, so it missed the release event. QQuickPathViewPrivate::handleMouseReleaseEvent() needs to take care of the snapping behavior after the user stops dragging. This only affects behavior in the case that the PathView is already moving and the mouse is pressed again: we assume the user wants to alter the PathView's velocity, not interact with any delegate inside or with any parent item. Task-number: QTBUG-77173 Task-number: QTBUG-59620 Change-Id: I7b2f69a6ef8d8022d7c917a5bf9e8fb40c8848db Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-09-05 11:57:19 +00:00
for (int duration = 100; duration > 0; duration -= 20) {
Add signal spies to tst_QQuickPathView::flickNClick test QTBUG-78926 is about failing to emit the movingChanged signal. The test verifies that e2df4233a77ce8a37d2c8ef26b7b42fc0d33a24b fixed it. While we're at it, might as well verify a few more signals in this test scenario where we flick the PathView at various speeds and then stop the flick by clicking. Fixes: QTBUG-78926 Change-Id: I1253dfcd88a63abdbdd280dd9097b484a93cc491 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-10-09 06:25:17 +00:00
movingChangedSpy.clear();
draggingSpy.clear();
dragStartedSpy.clear();
dragEndedSpy.clear();
currentIndexSpy.clear();
moveStartedSpy.clear();
moveEndedSpy.clear();
flickingSpy.clear();
flickStartedSpy.clear();
flickEndedSpy.clear();
PathView: grab mouse on press if already moving A side effect of 8fd398c9d2f5f54e446e0b402bc63a2edb50da6f is that it became possible for the highlight to stop between items, rather than snapping to a specific item, if the user taps, clicks or drags an additional time while the movement is ongoing. That was because it didn't get a mouse grab, so it missed the release event. QQuickPathViewPrivate::handleMouseReleaseEvent() needs to take care of the snapping behavior after the user stops dragging. This only affects behavior in the case that the PathView is already moving and the mouse is pressed again: we assume the user wants to alter the PathView's velocity, not interact with any delegate inside or with any parent item. Task-number: QTBUG-77173 Task-number: QTBUG-59620 Change-Id: I7b2f69a6ef8d8022d7c917a5bf9e8fb40c8848db Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-09-05 11:57:19 +00:00
// Dragging the child mouse area should animate the PathView (MA has no drag target)
flick(window.data(), QPoint(200,200), QPoint(400,200), duration);
QVERIFY(pathview->isMoving());
Add signal spies to tst_QQuickPathView::flickNClick test QTBUG-78926 is about failing to emit the movingChanged signal. The test verifies that e2df4233a77ce8a37d2c8ef26b7b42fc0d33a24b fixed it. While we're at it, might as well verify a few more signals in this test scenario where we flick the PathView at various speeds and then stop the flick by clicking. Fixes: QTBUG-78926 Change-Id: I1253dfcd88a63abdbdd280dd9097b484a93cc491 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-10-09 06:25:17 +00:00
QCOMPARE(movingChangedSpy.count(), 1);
QCOMPARE(draggingSpy.count(), 2);
QCOMPARE(dragStartedSpy.count(), 1);
QCOMPARE(dragEndedSpy.count(), 1);
QVERIFY(currentIndexSpy.count() > 0);
QCOMPARE(moveStartedSpy.count(), 1);
QCOMPARE(moveEndedSpy.count(), 0);
QCOMPARE(flickingSpy.count(), 1);
QCOMPARE(flickStartedSpy.count(), 1);
QCOMPARE(flickEndedSpy.count(), 0);
PathView: grab mouse on press if already moving A side effect of 8fd398c9d2f5f54e446e0b402bc63a2edb50da6f is that it became possible for the highlight to stop between items, rather than snapping to a specific item, if the user taps, clicks or drags an additional time while the movement is ongoing. That was because it didn't get a mouse grab, so it missed the release event. QQuickPathViewPrivate::handleMouseReleaseEvent() needs to take care of the snapping behavior after the user stops dragging. This only affects behavior in the case that the PathView is already moving and the mouse is pressed again: we assume the user wants to alter the PathView's velocity, not interact with any delegate inside or with any parent item. Task-number: QTBUG-77173 Task-number: QTBUG-59620 Change-Id: I7b2f69a6ef8d8022d7c917a5bf9e8fb40c8848db Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-09-05 11:57:19 +00:00
// Now while it's still moving, click it.
// The PathView should stop at a position such that offset is a whole number.
QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(200, 200));
QTRY_VERIFY(!pathview->isMoving());
Add signal spies to tst_QQuickPathView::flickNClick test QTBUG-78926 is about failing to emit the movingChanged signal. The test verifies that e2df4233a77ce8a37d2c8ef26b7b42fc0d33a24b fixed it. While we're at it, might as well verify a few more signals in this test scenario where we flick the PathView at various speeds and then stop the flick by clicking. Fixes: QTBUG-78926 Change-Id: I1253dfcd88a63abdbdd280dd9097b484a93cc491 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-10-09 06:25:17 +00:00
QCOMPARE(movingChangedSpy.count(), 2); // QTBUG-78926
QCOMPARE(draggingSpy.count(), 2);
QCOMPARE(dragStartedSpy.count(), 1);
QCOMPARE(dragEndedSpy.count(), 1);
QCOMPARE(moveStartedSpy.count(), 1);
QCOMPARE(moveEndedSpy.count(), 1);
QCOMPARE(flickingSpy.count(), 2);
QCOMPARE(flickStartedSpy.count(), 1);
QCOMPARE(flickEndedSpy.count(), 1);
PathView: grab mouse on press if already moving A side effect of 8fd398c9d2f5f54e446e0b402bc63a2edb50da6f is that it became possible for the highlight to stop between items, rather than snapping to a specific item, if the user taps, clicks or drags an additional time while the movement is ongoing. That was because it didn't get a mouse grab, so it missed the release event. QQuickPathViewPrivate::handleMouseReleaseEvent() needs to take care of the snapping behavior after the user stops dragging. This only affects behavior in the case that the PathView is already moving and the mouse is pressed again: we assume the user wants to alter the PathView's velocity, not interact with any delegate inside or with any parent item. Task-number: QTBUG-77173 Task-number: QTBUG-59620 Change-Id: I7b2f69a6ef8d8022d7c917a5bf9e8fb40c8848db Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-09-05 11:57:19 +00:00
QVERIFY(qFuzzyIsNull(pathview->offset() - int(pathview->offset())));
}
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::treeModel()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
QStandardItemModel model;
initStandardTreeModel(&model);
Modernize tst_QQuickPathView::treeModel() - Don't use context properties: a singleton is better - Use required properties to declare dependendencies Change-Id: I10a0a301e0a397b1d4fc9edf804eea3499c79025 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-06-10 11:10:16 +00:00
qmlRegisterSingletonInstance("Qt.treemodel", 1, 0, "TreeModelCpp", &model);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
Modernize tst_QQuickPathView::treeModel() - Don't use context properties: a singleton is better - Use required properties to declare dependendencies Change-Id: I10a0a301e0a397b1d4fc9edf804eea3499c79025 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-06-10 11:10:16 +00:00
QScopedPointer<QQuickView> window(createView());
window->show();
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->setSource(testFileUrl("treemodel.qml"));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(pathview->count(), 3);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickText *item = findItem<QQuickText>(pathview, "wrapper", 0);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(item);
QCOMPARE(item->text(), QLatin1String("Row 1 Item"));
QVERIFY(QMetaObject::invokeMethod(pathview, "setRoot", Q_ARG(QVariant, 1)));
QCOMPARE(pathview->count(), 1);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QTRY_VERIFY(item = findItem<QQuickText>(pathview, "wrapper", 0));
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QTRY_COMPARE(item->text(), QLatin1String("Row 2 Child Item"));
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::changePreferredHighlight()
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
{
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->setGeometry(0,0,400,200);
window->setSource(testFileUrl("dragpath.qml"));
window->show();
All QWindow properties that have "window" in them have been renamed. Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase. Change-Id: I9614cc2c7ed119c663b3f6f99267483e291e529c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-19 16:05:01 +00:00
window->requestActivate();
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QVERIFY(QTest::qWaitForWindowActive(window.data()));
QCOMPARE(window.data(), qGuiApp->focusWindow());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
int current = pathview->currentIndex();
QCOMPARE(current, 0);
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QQuickRectangle *firstItem = findItem<QQuickRectangle>(pathview, "wrapper", 0);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(firstItem);
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path());
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QVERIFY(path);
Expose QQuickPath::pointAtPercent as Q_INVOKABLE So it can be used in QML. Useful in combination with ShapePath, in order to add graphics along a Shape. [ChangeLog][QtQuick][Shapes] Exposed QQuickPath::pointAtPercent as invokable in QML. Change-Id: Ia8aeb2b74003410ce16d9d2a0c62d79a021530af Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-05-27 21:36:31 +00:00
QPointF start = path->pointAtPercent(0.5);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QPointF offset;//Center of item is at point, but pos is from corner
offset.setX(firstItem->width()/2);
offset.setY(firstItem->height()/2);
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QTRY_COMPARE(firstItem->position() + offset, start);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
pathview->setPreferredHighlightBegin(0.8);
pathview->setPreferredHighlightEnd(0.8);
Expose QQuickPath::pointAtPercent as Q_INVOKABLE So it can be used in QML. Useful in combination with ShapePath, in order to add graphics along a Shape. [ChangeLog][QtQuick][Shapes] Exposed QQuickPath::pointAtPercent as invokable in QML. Change-Id: Ia8aeb2b74003410ce16d9d2a0c62d79a021530af Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-05-27 21:36:31 +00:00
start = path->pointAtPercent(0.8);
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QTRY_COMPARE(firstItem->position() + offset, start);
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
QCOMPARE(pathview->currentIndex(), 0);
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::creationContext()
Fix ListView components being unable to access context properties. Where avaialable use the components creation context instead of the views context as the root context for the new item. Task-number: QTBUG-21865 Change-Id: I07e564548de57d58413dc0d7cd151bd8a90886e7 Reviewed-on: http://codereview.qt-project.org/6199 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-10-07 03:06:26 +00:00
{
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickView window;
window.setGeometry(0,0,240,320);
window.setSource(testFileUrl("creationContext.qml"));
Fix ListView components being unable to access context properties. Where avaialable use the components creation context instead of the views context as the root context for the new item. Task-number: QTBUG-21865 Change-Id: I07e564548de57d58413dc0d7cd151bd8a90886e7 Reviewed-on: http://codereview.qt-project.org/6199 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-10-07 03:06:26 +00:00
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickItem *rootItem = qobject_cast<QQuickItem *>(window.rootObject());
Fix ListView components being unable to access context properties. Where avaialable use the components creation context instead of the views context as the root context for the new item. Task-number: QTBUG-21865 Change-Id: I07e564548de57d58413dc0d7cd151bd8a90886e7 Reviewed-on: http://codereview.qt-project.org/6199 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-10-07 03:06:26 +00:00
QVERIFY(rootItem);
QVERIFY(rootItem->property("count").toInt() > 0);
tst_QQuickPathView, tst_QQuickListView: Fix compiler warnings Fix warnings about assignment used as truth value in Q[TRY_]VERIFY by generally pulling out the assignment in case of QVERIFY and adding parentheses in case of QTRY_VERIFY. Also fix 2 cases in which apparently QTRY_VERIFY(find()) was intended. Fixes warnings: tst_qquickpathview.cpp: In member function 'void tst_QQuickPathView::creationContext()': tst_qquickpathview.cpp:1637:100: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquickpathview.cpp: In member function 'void tst_QQuickPathView::currentOffsetOnInsertion()': tst_qquickpathview.cpp:1688:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquickpathview.cpp:1700:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquickpathview.cpp:1712:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::sectionsPositioning()': tst_qquicklistview.cpp:2392:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::itemListFlicker()': tst_qquicklistview.cpp:2979:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2981:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2983:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2988:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2990:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2992:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2997:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2999:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:3001:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::creationContext()': tst_qquicklistview.cpp:5339:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5341:98: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5343:98: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5345:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::unrequestedVisibility()': tst_qquicklistview.cpp:5626:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5628:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5631:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5633:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5636:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5638:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5640:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5642:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5650:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5652:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5663:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5665:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5668:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5670:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5673:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5675:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5677:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5679:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5687:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5690:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5692:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5695:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5697:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5699:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5701:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5707:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5709:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5711:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5713:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5719:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5721:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5723:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5725:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5731:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5733:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5735:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5737:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5743:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5745:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5747:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5749:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::displayMargin()': tst_qquicklistview.cpp:7255:100: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:7259:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::negativeDisplayMargin()': tst_qquicklistview.cpp:7292:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:7295:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:7298:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:7303:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] Change-Id: Ic069c8336cf15db75860c6f79dfd215a5592ca79 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
2016-11-30 09:29:06 +00:00
QQuickItem *item = findItem<QQuickItem>(rootItem, "listItem", 0);
QVERIFY(item);
Fix ListView components being unable to access context properties. Where avaialable use the components creation context instead of the views context as the root context for the new item. Task-number: QTBUG-21865 Change-Id: I07e564548de57d58413dc0d7cd151bd8a90886e7 Reviewed-on: http://codereview.qt-project.org/6199 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-10-07 03:06:26 +00:00
QCOMPARE(item->property("text").toString(), QString("Hello!"));
}
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
// QTBUG-21320
void tst_QQuickPathView::currentOffsetOnInsertion()
{
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->show();
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
Separate out some of the common test code Moves findItem, findItems() etc. into shared/visualtestutil.h and moves duplicate list model test classes and other common view-specific code into shared/viewtestutil.h. Change-Id: Ia79bc4df1ab7fb618597755c0288a2e8f5054faf Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-01-31 07:15:00 +00:00
QaimModel model;
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQmlContext *ctxt = window->rootContext();
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
ctxt->setContextProperty("testModel", &model);
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->setSource(testFileUrl("pathline.qml"));
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
qApp->processEvents();
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathview = findItem<QQuickPathView>(window->rootObject(), "view");
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
pathview->setPreferredHighlightBegin(0.5);
pathview->setPreferredHighlightEnd(0.5);
QCOMPARE(pathview->count(), model.count());
model.addItem("item0", "0");
QCOMPARE(pathview->count(), model.count());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QQuickRectangle *item = nullptr;
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
QTRY_VERIFY(item = findItem<QQuickRectangle>(pathview, "wrapper", 0));
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path());
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
QVERIFY(path);
Expose QQuickPath::pointAtPercent as Q_INVOKABLE So it can be used in QML. Useful in combination with ShapePath, in order to add graphics along a Shape. [ChangeLog][QtQuick][Shapes] Exposed QQuickPath::pointAtPercent as invokable in QML. Change-Id: Ia8aeb2b74003410ce16d9d2a0c62d79a021530af Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-05-27 21:36:31 +00:00
QPointF start = path->pointAtPercent(0.5);
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
QPointF offset;//Center of item is at point, but pos is from corner
offset.setX(item->width()/2);
offset.setY(item->height()/2);
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QCOMPARE(item->position() + offset, start);
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
QSignalSpy currentIndexSpy(pathview, SIGNAL(currentIndexChanged()));
// insert an item at the beginning
model.insertItem(0, "item1", "1");
qApp->processEvents();
QCOMPARE(currentIndexSpy.count(), 1);
// currentIndex is now 1
tst_QQuickPathView, tst_QQuickListView: Fix compiler warnings Fix warnings about assignment used as truth value in Q[TRY_]VERIFY by generally pulling out the assignment in case of QVERIFY and adding parentheses in case of QTRY_VERIFY. Also fix 2 cases in which apparently QTRY_VERIFY(find()) was intended. Fixes warnings: tst_qquickpathview.cpp: In member function 'void tst_QQuickPathView::creationContext()': tst_qquickpathview.cpp:1637:100: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquickpathview.cpp: In member function 'void tst_QQuickPathView::currentOffsetOnInsertion()': tst_qquickpathview.cpp:1688:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquickpathview.cpp:1700:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquickpathview.cpp:1712:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::sectionsPositioning()': tst_qquicklistview.cpp:2392:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::itemListFlicker()': tst_qquicklistview.cpp:2979:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2981:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2983:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2988:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2990:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2992:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2997:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2999:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:3001:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::creationContext()': tst_qquicklistview.cpp:5339:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5341:98: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5343:98: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5345:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::unrequestedVisibility()': tst_qquicklistview.cpp:5626:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5628:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5631:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5633:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5636:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5638:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5640:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5642:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5650:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5652:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5663:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5665:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5668:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5670:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5673:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5675:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5677:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5679:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5687:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5690:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5692:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5695:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5697:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5699:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5701:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5707:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5709:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5711:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5713:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5719:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5721:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5723:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5725:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5731:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5733:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5735:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5737:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5743:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5745:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5747:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5749:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::displayMargin()': tst_qquicklistview.cpp:7255:100: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:7259:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::negativeDisplayMargin()': tst_qquicklistview.cpp:7292:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:7295:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:7298:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:7303:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] Change-Id: Ic069c8336cf15db75860c6f79dfd215a5592ca79 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
2016-11-30 09:29:06 +00:00
item = findItem<QQuickRectangle>(pathview, "wrapper", 1);
QVERIFY(item);
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
// verify that current item (item 1) is still at offset 0.5
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QCOMPARE(item->position() + offset, start);
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
// insert another item at the beginning
model.insertItem(0, "item2", "2");
qApp->processEvents();
QCOMPARE(currentIndexSpy.count(), 2);
// currentIndex is now 2
tst_QQuickPathView, tst_QQuickListView: Fix compiler warnings Fix warnings about assignment used as truth value in Q[TRY_]VERIFY by generally pulling out the assignment in case of QVERIFY and adding parentheses in case of QTRY_VERIFY. Also fix 2 cases in which apparently QTRY_VERIFY(find()) was intended. Fixes warnings: tst_qquickpathview.cpp: In member function 'void tst_QQuickPathView::creationContext()': tst_qquickpathview.cpp:1637:100: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquickpathview.cpp: In member function 'void tst_QQuickPathView::currentOffsetOnInsertion()': tst_qquickpathview.cpp:1688:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquickpathview.cpp:1700:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquickpathview.cpp:1712:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::sectionsPositioning()': tst_qquicklistview.cpp:2392:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::itemListFlicker()': tst_qquicklistview.cpp:2979:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2981:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2983:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2988:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2990:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2992:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2997:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2999:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:3001:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::creationContext()': tst_qquicklistview.cpp:5339:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5341:98: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5343:98: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5345:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::unrequestedVisibility()': tst_qquicklistview.cpp:5626:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5628:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5631:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5633:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5636:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5638:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5640:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5642:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5650:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5652:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5663:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5665:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5668:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5670:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5673:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5675:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5677:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5679:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5687:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5690:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5692:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5695:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5697:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5699:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5701:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5707:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5709:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5711:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5713:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5719:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5721:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5723:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5725:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5731:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5733:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5735:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5737:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5743:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5745:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5747:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5749:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::displayMargin()': tst_qquicklistview.cpp:7255:100: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:7259:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::negativeDisplayMargin()': tst_qquicklistview.cpp:7292:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:7295:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:7298:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:7303:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] Change-Id: Ic069c8336cf15db75860c6f79dfd215a5592ca79 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
2016-11-30 09:29:06 +00:00
item = findItem<QQuickRectangle>(pathview, "wrapper", 2);
QVERIFY(item);
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
// verify that current item (item 2) is still at offset 0.5
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QCOMPARE(item->position() + offset, start);
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
// verify that remove before current maintains current item
model.removeItem(0);
qApp->processEvents();
QCOMPARE(currentIndexSpy.count(), 3);
// currentIndex is now 1
tst_QQuickPathView, tst_QQuickListView: Fix compiler warnings Fix warnings about assignment used as truth value in Q[TRY_]VERIFY by generally pulling out the assignment in case of QVERIFY and adding parentheses in case of QTRY_VERIFY. Also fix 2 cases in which apparently QTRY_VERIFY(find()) was intended. Fixes warnings: tst_qquickpathview.cpp: In member function 'void tst_QQuickPathView::creationContext()': tst_qquickpathview.cpp:1637:100: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquickpathview.cpp: In member function 'void tst_QQuickPathView::currentOffsetOnInsertion()': tst_qquickpathview.cpp:1688:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquickpathview.cpp:1700:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquickpathview.cpp:1712:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::sectionsPositioning()': tst_qquicklistview.cpp:2392:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::itemListFlicker()': tst_qquicklistview.cpp:2979:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2981:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2983:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2988:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2990:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2992:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2997:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:2999:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:3001:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::creationContext()': tst_qquicklistview.cpp:5339:97: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5341:98: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5343:98: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5345:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::unrequestedVisibility()': tst_qquicklistview.cpp:5626:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5628:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5631:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5633:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5636:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5638:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5640:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5642:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5650:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5652:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5663:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5665:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5668:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5670:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5673:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5675:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5677:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5679:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5687:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5690:103: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5692:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5695:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5697:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5699:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5701:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5707:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5709:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5711:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5713:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5719:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5721:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5723:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5725:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5731:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5733:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5735:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5737:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5743:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5745:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5747:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:5749:104: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::displayMargin()': tst_qquicklistview.cpp:7255:100: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:7259:102: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp: In member function 'void tst_QQuickListView::negativeDisplayMargin()': tst_qquicklistview.cpp:7292:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:7295:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:7298:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qquicklistview.cpp:7303:99: warning: suggest parentheses around assignment used as truth value [-Wparentheses] Change-Id: Ic069c8336cf15db75860c6f79dfd215a5592ca79 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
2016-11-30 09:29:06 +00:00
item = findItem<QQuickRectangle>(pathview, "wrapper", 1);
QVERIFY(item);
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
// verify that current item (item 1) is still at offset 0.5
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QCOMPARE(item->position() + offset, start);
PathView element's current item changes on insertion. When inserting an item before the current item update the offset to ensure the current item doesn't change. Task-number: QTBUG-21320 Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f Reviewed-by: Bea Lam <bea.lam@nokia.com>
2011-11-09 05:34:01 +00:00
}
Non-blocking view delegate instantiation. Task-number: QTBUG-21792 Change-Id: I29a4028cd24eb55d4768aacaa3abbd1786061398 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2011-11-03 05:52:13 +00:00
void tst_QQuickPathView::asynchronous()
{
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->show();
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQmlIncubationController controller;
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->engine()->setIncubationController(&controller);
Non-blocking view delegate instantiation. Task-number: QTBUG-21792 Change-Id: I29a4028cd24eb55d4768aacaa3abbd1786061398 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2011-11-03 05:52:13 +00:00
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->setSource(testFileUrl("asyncloader.qml"));
Non-blocking view delegate instantiation. Task-number: QTBUG-21792 Change-Id: I29a4028cd24eb55d4768aacaa3abbd1786061398 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2011-11-03 05:52:13 +00:00
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickItem *rootObject = qobject_cast<QQuickItem*>(window->rootObject());
Non-blocking view delegate instantiation. Task-number: QTBUG-21792 Change-Id: I29a4028cd24eb55d4768aacaa3abbd1786061398 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2011-11-03 05:52:13 +00:00
QVERIFY(rootObject);
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QQuickPathView *pathview = nullptr;
Non-blocking view delegate instantiation. Task-number: QTBUG-21792 Change-Id: I29a4028cd24eb55d4768aacaa3abbd1786061398 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2011-11-03 05:52:13 +00:00
while (!pathview) {
Autotests: use std::atomic in incubateWhile() Followup to a9bf6e652aa99784343c94b0181c9443205e2a82 Change-Id: Ic010f2610177f93f8fc4e2312d6736c96390e585 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-05-13 09:11:23 +00:00
std::atomic<bool> b = false;
Non-blocking view delegate instantiation. Task-number: QTBUG-21792 Change-Id: I29a4028cd24eb55d4768aacaa3abbd1786061398 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2011-11-03 05:52:13 +00:00
controller.incubateWhile(&b);
pathview = rootObject->findChild<QQuickPathView*>("view");
}
// items will be created one at a time
for (int i = 0; i < 5; ++i) {
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(findItem<QQuickItem>(pathview, "wrapper", i) == nullptr);
QQuickItem *item = nullptr;
Non-blocking view delegate instantiation. Task-number: QTBUG-21792 Change-Id: I29a4028cd24eb55d4768aacaa3abbd1786061398 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2011-11-03 05:52:13 +00:00
while (!item) {
Autotests: use std::atomic in incubateWhile() Followup to a9bf6e652aa99784343c94b0181c9443205e2a82 Change-Id: Ic010f2610177f93f8fc4e2312d6736c96390e585 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-05-13 09:11:23 +00:00
std::atomic<bool> b = false;
Non-blocking view delegate instantiation. Task-number: QTBUG-21792 Change-Id: I29a4028cd24eb55d4768aacaa3abbd1786061398 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2011-11-03 05:52:13 +00:00
controller.incubateWhile(&b);
item = findItem<QQuickItem>(pathview, "wrapper", i);
}
}
{
Autotests: use std::atomic in incubateWhile() Followup to a9bf6e652aa99784343c94b0181c9443205e2a82 Change-Id: Ic010f2610177f93f8fc4e2312d6736c96390e585 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-05-13 09:11:23 +00:00
std::atomic<bool> b = true;
Non-blocking view delegate instantiation. Task-number: QTBUG-21792 Change-Id: I29a4028cd24eb55d4768aacaa3abbd1786061398 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2011-11-03 05:52:13 +00:00
controller.incubateWhile(&b);
}
// verify positioning
QQuickRectangle *firstItem = findItem<QQuickRectangle>(pathview, "wrapper", 0);
QVERIFY(firstItem);
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path());
Non-blocking view delegate instantiation. Task-number: QTBUG-21792 Change-Id: I29a4028cd24eb55d4768aacaa3abbd1786061398 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2011-11-03 05:52:13 +00:00
QVERIFY(path);
Expose QQuickPath::pointAtPercent as Q_INVOKABLE So it can be used in QML. Useful in combination with ShapePath, in order to add graphics along a Shape. [ChangeLog][QtQuick][Shapes] Exposed QQuickPath::pointAtPercent as invokable in QML. Change-Id: Ia8aeb2b74003410ce16d9d2a0c62d79a021530af Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-05-27 21:36:31 +00:00
QPointF start = path->pointAtPercent(0.0);
Non-blocking view delegate instantiation. Task-number: QTBUG-21792 Change-Id: I29a4028cd24eb55d4768aacaa3abbd1786061398 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2011-11-03 05:52:13 +00:00
QPointF offset;//Center of item is at point, but pos is from corner
offset.setX(firstItem->width()/2);
offset.setY(firstItem->height()/2);
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QTRY_COMPARE(firstItem->position() + offset, start);
Non-blocking view delegate instantiation. Task-number: QTBUG-21792 Change-Id: I29a4028cd24eb55d4768aacaa3abbd1786061398 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2011-11-03 05:52:13 +00:00
pathview->setOffset(1.0);
for (int i=0; i<5; i++) {
QQuickItem *curItem = findItem<QQuickItem>(pathview, "wrapper", i);
Expose QQuickPath::pointAtPercent as Q_INVOKABLE So it can be used in QML. Useful in combination with ShapePath, in order to add graphics along a Shape. [ChangeLog][QtQuick][Shapes] Exposed QQuickPath::pointAtPercent as invokable in QML. Change-Id: Ia8aeb2b74003410ce16d9d2a0c62d79a021530af Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-05-27 21:36:31 +00:00
QPointF itemPos(path->pointAtPercent(0.2 + i*0.2));
Renamed QQuickItem::pos property to position Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-22 14:59:25 +00:00
QCOMPARE(curItem->position() + offset, itemPos);
Non-blocking view delegate instantiation. Task-number: QTBUG-21792 Change-Id: I29a4028cd24eb55d4768aacaa3abbd1786061398 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2011-11-03 05:52:13 +00:00
}
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
void tst_QQuickPathView::missingPercent()
Correctly set ending path percent if none is provided. Task-number: QTBUG-19818 Change-Id: I5377551d041b593864d56e4449c133deb47d3b45 Reviewed-on: http://codereview.qt.nokia.com/2358 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-07-29 00:41:47 +00:00
{
Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-16 04:43:03 +00:00
QQmlEngine engine;
QQmlComponent c(&engine, testFileUrl("missingPercent.qml"));
QQuickPath *obj = qobject_cast<QQuickPath*>(c.create());
Correctly set ending path percent if none is provided. Task-number: QTBUG-19818 Change-Id: I5377551d041b593864d56e4449c133deb47d3b45 Reviewed-on: http://codereview.qt.nokia.com/2358 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-07-29 00:41:47 +00:00
QVERIFY(obj);
QCOMPARE(obj->attributeAt("_qfx_percent", 1.0), qreal(1.0));
delete obj;
}
Add diagnostic output to tst_qquickpathview::cancelDrag(). Task-number: QTBUG-32662 Change-Id: I62b53f94659be95b3bef86f853733998d4d882dc Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-29 12:46:37 +00:00
static inline bool hasFraction(qreal o)
{
const bool result = o != qFloor(o);
if (!result)
qDebug() << "o != qFloor(o)" << o;
return result;
}
Restore view to sensible position if grab is cancelled. If the mouse grab is stolen, return to allowed bounds. Change-Id: Icc44da32ff62bed273f0ccbb5498766981cdf9a4 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-03-15 04:58:03 +00:00
void tst_QQuickPathView::cancelDrag()
{
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->setSource(testFileUrl("dragpath.qml"));
tst_qquickpathview::cancelDrag(): Move mouse after setUrl(). Take correct window size into account. Task-number: QTBUG-32662 Change-Id: Ie04c8fe8e254d232f076e6f9d9d0d96f12a4530f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-08-30 08:01:15 +00:00
QQuickViewTestUtil::moveMouseAway(window.data());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->show();
All QWindow properties that have "window" in them have been renamed. Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase. Change-Id: I9614cc2c7ed119c663b3f6f99267483e291e529c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-19 16:05:01 +00:00
window->requestActivate();
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QVERIFY(QTest::qWaitForWindowActive(window.data()));
QCOMPARE(window.data(), qGuiApp->focusWindow());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Restore view to sensible position if grab is cancelled. If the mouse grab is stolen, return to allowed bounds. Change-Id: Icc44da32ff62bed273f0ccbb5498766981cdf9a4 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-03-15 04:58:03 +00:00
PathView needs drag events similar to Flickable Added dragging property and dragStarted() and dragEnded() signals. Task-number: QTBUG-21740 Change-Id: I718835ff7e46af615951ec5f248eba41bac31071 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2012-07-03 03:57:54 +00:00
QSignalSpy draggingSpy(pathview, SIGNAL(draggingChanged()));
QSignalSpy dragStartedSpy(pathview, SIGNAL(dragStarted()));
QSignalSpy dragEndedSpy(pathview, SIGNAL(dragEnded()));
Restore view to sensible position if grab is cancelled. If the mouse grab is stolen, return to allowed bounds. Change-Id: Icc44da32ff62bed273f0ccbb5498766981cdf9a4 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-03-15 04:58:03 +00:00
// drag between snap points
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QTest::mousePress(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(10,100));
Restore view to sensible position if grab is cancelled. If the mouse grab is stolen, return to allowed bounds. Change-Id: Icc44da32ff62bed273f0ccbb5498766981cdf9a4 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-03-15 04:58:03 +00:00
QTest::qWait(100);
Stabilize the drag related autotests for higher dpi displays Higher DPI displays might have a larger StartDragDistance (at least on X11), breaking the autotest on these displays. Change-Id: I9768a245a7654665dd9f718100289e9416d8c855 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2015-01-09 09:53:12 +00:00
QTest::mouseMove(window.data(), QPoint(80, 100));
QTest::mouseMove(window.data(), QPoint(130, 100));
Restore view to sensible position if grab is cancelled. If the mouse grab is stolen, return to allowed bounds. Change-Id: Icc44da32ff62bed273f0ccbb5498766981cdf9a4 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-03-15 04:58:03 +00:00
Add diagnostic output to tst_qquickpathview::cancelDrag(). Task-number: QTBUG-32662 Change-Id: I62b53f94659be95b3bef86f853733998d4d882dc Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-29 12:46:37 +00:00
QTRY_VERIFY(hasFraction(pathview->offset()));
Restore view to sensible position if grab is cancelled. If the mouse grab is stolen, return to allowed bounds. Change-Id: Icc44da32ff62bed273f0ccbb5498766981cdf9a4 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-03-15 04:58:03 +00:00
QTRY_VERIFY(pathview->isMoving());
PathView needs drag events similar to Flickable Added dragging property and dragStarted() and dragEnded() signals. Task-number: QTBUG-21740 Change-Id: I718835ff7e46af615951ec5f248eba41bac31071 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2012-07-03 03:57:54 +00:00
QVERIFY(pathview->isDragging());
QCOMPARE(draggingSpy.count(), 1);
QCOMPARE(dragStartedSpy.count(), 1);
QCOMPARE(dragEndedSpy.count(), 0);
Restore view to sensible position if grab is cancelled. If the mouse grab is stolen, return to allowed bounds. Change-Id: Icc44da32ff62bed273f0ccbb5498766981cdf9a4 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-03-15 04:58:03 +00:00
// steal mouse grab - cancels PathView dragging
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickItem *item = window->rootObject()->findChild<QQuickItem*>("text");
Restore view to sensible position if grab is cancelled. If the mouse grab is stolen, return to allowed bounds. Change-Id: Icc44da32ff62bed273f0ccbb5498766981cdf9a4 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-03-15 04:58:03 +00:00
item->grabMouse();
// returns to a snap point.
tests/quick: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: Ib9f4c2486af23c47990be4b9e004b965de226dcc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-07-24 13:32:22 +00:00
QTRY_COMPARE(pathview->offset(), qreal(qFloor(pathview->offset())));
Restore view to sensible position if grab is cancelled. If the mouse grab is stolen, return to allowed bounds. Change-Id: Icc44da32ff62bed273f0ccbb5498766981cdf9a4 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-03-15 04:58:03 +00:00
QTRY_VERIFY(!pathview->isMoving());
PathView needs drag events similar to Flickable Added dragging property and dragStarted() and dragEnded() signals. Task-number: QTBUG-21740 Change-Id: I718835ff7e46af615951ec5f248eba41bac31071 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
2012-07-03 03:57:54 +00:00
QVERIFY(!pathview->isDragging());
QCOMPARE(draggingSpy.count(), 2);
QCOMPARE(dragStartedSpy.count(), 1);
QCOMPARE(dragEndedSpy.count(), 1);
Restore view to sensible position if grab is cancelled. If the mouse grab is stolen, return to allowed bounds. Change-Id: Icc44da32ff62bed273f0ccbb5498766981cdf9a4 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-03-15 04:58:03 +00:00
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(40,100));
Restore view to sensible position if grab is cancelled. If the mouse grab is stolen, return to allowed bounds. Change-Id: Icc44da32ff62bed273f0ccbb5498766981cdf9a4 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-03-15 04:58:03 +00:00
}
PathView was missing the maximumFlickVelocity property Change-Id: I0ed4ff0fe169187f7a8e03597be7407e9896100d Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-25 02:37:08 +00:00
void tst_QQuickPathView::maximumFlickVelocity()
{
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->setSource(testFileUrl("dragpath.qml"));
Stabilize tests using utilities from QQuickViewTestUtil. Change QQuickViewTestUtil::createView() to center the window on the screen to avoid taskbar areas. Add routine to move the mouse away and use that in tests using QQuickViewTestUtil::flick() and other mouse interaction since the mouse cursor can interfere with it. Affected tests: qquickgridview, qquickpathview, qquickflickable, qquicklistview, qquickrepeater and qquickpositioners. Task-number: QTBUG-33017 Change-Id: I540c0efb54a231dcb44c8fd5ad9573a2d4d4b9df Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2013-08-23 11:35:00 +00:00
QQuickViewTestUtil::moveMouseAway(window.data());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->show();
All QWindow properties that have "window" in them have been renamed. Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase. Change-Id: I9614cc2c7ed119c663b3f6f99267483e291e529c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-19 16:05:01 +00:00
window->requestActivate();
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QVERIFY(QTest::qWaitForWindowActive(window.data()));
QCOMPARE(window.data(), qGuiApp->focusWindow());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
PathView was missing the maximumFlickVelocity property Change-Id: I0ed4ff0fe169187f7a8e03597be7407e9896100d Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-25 02:37:08 +00:00
pathview->setMaximumFlickVelocity(700);
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
flick(window.data(), QPoint(200,10), QPoint(10,10), 180);
PathView was missing the maximumFlickVelocity property Change-Id: I0ed4ff0fe169187f7a8e03597be7407e9896100d Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-25 02:37:08 +00:00
QVERIFY(pathview->isMoving());
QVERIFY(pathview->isFlicking());
Stabilize tst_qquickpathview The complete flick is already a long operation, so when it's delayed due to heavy system load it can exceed 5s easily. Increase the timeout to give the flick time to finish. Change-Id: I333c41ea432676a8c7f6de637f6af98203cd07fb Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-12-05 20:57:45 +00:00
QTRY_VERIFY_WITH_TIMEOUT(!pathview->isMoving(), 50000);
PathView was missing the maximumFlickVelocity property Change-Id: I0ed4ff0fe169187f7a8e03597be7407e9896100d Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-25 02:37:08 +00:00
double dist1 = 100 - pathview->offset();
pathview->setOffset(0.);
pathview->setMaximumFlickVelocity(300);
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
flick(window.data(), QPoint(200,10), QPoint(10,10), 180);
PathView was missing the maximumFlickVelocity property Change-Id: I0ed4ff0fe169187f7a8e03597be7407e9896100d Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-25 02:37:08 +00:00
QVERIFY(pathview->isMoving());
QVERIFY(pathview->isFlicking());
Stabilize tst_qquickpathview The complete flick is already a long operation, so when it's delayed due to heavy system load it can exceed 5s easily. Increase the timeout to give the flick time to finish. Change-Id: I333c41ea432676a8c7f6de637f6af98203cd07fb Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-12-05 20:57:45 +00:00
QTRY_VERIFY_WITH_TIMEOUT(!pathview->isMoving(), 50000);
PathView was missing the maximumFlickVelocity property Change-Id: I0ed4ff0fe169187f7a8e03597be7407e9896100d Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-25 02:37:08 +00:00
double dist2 = 100 - pathview->offset();
pathview->setOffset(0.);
pathview->setMaximumFlickVelocity(500);
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
flick(window.data(), QPoint(200,10), QPoint(10,10), 180);
PathView was missing the maximumFlickVelocity property Change-Id: I0ed4ff0fe169187f7a8e03597be7407e9896100d Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-25 02:37:08 +00:00
QVERIFY(pathview->isMoving());
QVERIFY(pathview->isFlicking());
Stabilize tst_qquickpathview The complete flick is already a long operation, so when it's delayed due to heavy system load it can exceed 5s easily. Increase the timeout to give the flick time to finish. Change-Id: I333c41ea432676a8c7f6de637f6af98203cd07fb Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-12-05 20:57:45 +00:00
QTRY_VERIFY_WITH_TIMEOUT(!pathview->isMoving(), 50000);
PathView was missing the maximumFlickVelocity property Change-Id: I0ed4ff0fe169187f7a8e03597be7407e9896100d Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-25 02:37:08 +00:00
double dist3 = 100 - pathview->offset();
QVERIFY(dist1 > dist2);
QVERIFY(dist3 > dist2);
QVERIFY(dist2 < dist1);
}
Support snapMode in PathView PathView missed out on snapMode, which is especially useful for its SnapOneItem mode. Change-Id: I0e9b080ef72d9bc1e305445cd8dfde8e21e4e3da Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-21 03:18:05 +00:00
void tst_QQuickPathView::snapToItem()
{
QFETCH(bool, enforceRange);
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
Stabilize tests using utilities from QQuickViewTestUtil. Change QQuickViewTestUtil::createView() to center the window on the screen to avoid taskbar areas. Add routine to move the mouse away and use that in tests using QQuickViewTestUtil::flick() and other mouse interaction since the mouse cursor can interfere with it. Affected tests: qquickgridview, qquickpathview, qquickflickable, qquicklistview, qquickrepeater and qquickpositioners. Task-number: QTBUG-33017 Change-Id: I540c0efb54a231dcb44c8fd5ad9573a2d4d4b9df Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2013-08-23 11:35:00 +00:00
QQuickViewTestUtil::moveMouseAway(window.data());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->setSource(testFileUrl("panels.qml"));
tst_qquickpathview: show window before flicking It's uncertain whether this caused any actual CI failures, but other tests show the window first, and this one tests interactive functionality so it makes sense that it should be visible. Change-Id: I92c26ce596f556765917409ca4e9037bdaccfa23 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2014-02-25 11:57:45 +00:00
window->show();
window->requestActivate();
QVERIFY(QTest::qWaitForWindowActive(window.data()));
QCOMPARE(window.data(), qGuiApp->focusWindow());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathview = window->rootObject()->findChild<QQuickPathView*>("view");
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Support snapMode in PathView PathView missed out on snapMode, which is especially useful for its SnapOneItem mode. Change-Id: I0e9b080ef72d9bc1e305445cd8dfde8e21e4e3da Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-21 03:18:05 +00:00
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->rootObject()->setProperty("enforceRange", enforceRange);
Support snapMode in PathView PathView missed out on snapMode, which is especially useful for its SnapOneItem mode. Change-Id: I0e9b080ef72d9bc1e305445cd8dfde8e21e4e3da Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-21 03:18:05 +00:00
QTRY_VERIFY(!pathview->isMoving()); // ensure stable
int currentIndex = pathview->currentIndex();
QSignalSpy snapModeSpy(pathview, SIGNAL(snapModeChanged()));
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
flick(window.data(), QPoint(200,10), QPoint(10,10), 180);
Support snapMode in PathView PathView missed out on snapMode, which is especially useful for its SnapOneItem mode. Change-Id: I0e9b080ef72d9bc1e305445cd8dfde8e21e4e3da Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-21 03:18:05 +00:00
QVERIFY(pathview->isMoving());
Try to stabilize tst_QQuickPathView Change-Id: I673604d4f0bc90352efe115422762c7c4ec210ad Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-03-19 12:11:27 +00:00
QTRY_VERIFY_WITH_TIMEOUT(!pathview->isMoving(), 50000);
Support snapMode in PathView PathView missed out on snapMode, which is especially useful for its SnapOneItem mode. Change-Id: I0e9b080ef72d9bc1e305445cd8dfde8e21e4e3da Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-21 03:18:05 +00:00
tests/quick: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: Ib9f4c2486af23c47990be4b9e004b965de226dcc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-07-24 13:32:22 +00:00
QCOMPARE(pathview->offset(), qreal(qFloor(pathview->offset())));
Support snapMode in PathView PathView missed out on snapMode, which is especially useful for its SnapOneItem mode. Change-Id: I0e9b080ef72d9bc1e305445cd8dfde8e21e4e3da Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-21 03:18:05 +00:00
if (enforceRange)
QVERIFY(pathview->currentIndex() != currentIndex);
else
tst_qquickpathview: Use QCOMPARE instead of QVERIFY. Attempting to get some diagnostic output for the failues. Task-number: QTBUG-35705 Change-Id: Iffebae89743c31e88125c0b1e21be172d3373b05 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2013-12-18 11:07:38 +00:00
QCOMPARE(pathview->currentIndex(), currentIndex);
Changing PathView model after componentComplete should reset position If the model is changed after the component is completed, the offset and currentIndex should be reset to 0. Change-Id: Ie36eb0c17ce6602c6ae15b5ee7aeb8b1a6e7854b Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-18 00:36:17 +00:00
Support snapMode in PathView PathView missed out on snapMode, which is especially useful for its SnapOneItem mode. Change-Id: I0e9b080ef72d9bc1e305445cd8dfde8e21e4e3da Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-21 03:18:05 +00:00
}
void tst_QQuickPathView::snapToItem_data()
{
QTest::addColumn<bool>("enforceRange");
QTest::newRow("no enforce range") << false;
QTest::newRow("enforce range") << true;
}
void tst_QQuickPathView::snapOneItem()
{
QFETCH(bool, enforceRange);
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
Stabilize tests using utilities from QQuickViewTestUtil. Change QQuickViewTestUtil::createView() to center the window on the screen to avoid taskbar areas. Add routine to move the mouse away and use that in tests using QQuickViewTestUtil::flick() and other mouse interaction since the mouse cursor can interfere with it. Affected tests: qquickgridview, qquickpathview, qquickflickable, qquicklistview, qquickrepeater and qquickpositioners. Task-number: QTBUG-33017 Change-Id: I540c0efb54a231dcb44c8fd5ad9573a2d4d4b9df Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2013-08-23 11:35:00 +00:00
QQuickViewTestUtil::moveMouseAway(window.data());
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->setSource(testFileUrl("panels.qml"));
window->show();
All QWindow properties that have "window" in them have been renamed. Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase. Change-Id: I9614cc2c7ed119c663b3f6f99267483e291e529c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-19 16:05:01 +00:00
window->requestActivate();
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QVERIFY(QTest::qWaitForWindowActive(window.data()));
QCOMPARE(window.data(), qGuiApp->focusWindow());
Support snapMode in PathView PathView missed out on snapMode, which is especially useful for its SnapOneItem mode. Change-Id: I0e9b080ef72d9bc1e305445cd8dfde8e21e4e3da Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-21 03:18:05 +00:00
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
QQuickPathView *pathview = window->rootObject()->findChild<QQuickPathView*>("view");
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Support snapMode in PathView PathView missed out on snapMode, which is especially useful for its SnapOneItem mode. Change-Id: I0e9b080ef72d9bc1e305445cd8dfde8e21e4e3da Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-21 03:18:05 +00:00
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->rootObject()->setProperty("enforceRange", enforceRange);
Support snapMode in PathView PathView missed out on snapMode, which is especially useful for its SnapOneItem mode. Change-Id: I0e9b080ef72d9bc1e305445cd8dfde8e21e4e3da Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-21 03:18:05 +00:00
QSignalSpy snapModeSpy(pathview, SIGNAL(snapModeChanged()));
QQuickCanvas renames QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-11 07:32:16 +00:00
window->rootObject()->setProperty("snapOne", true);
tst_qquickpathview: Use QCOMPARE instead of QVERIFY. Attempting to get some diagnostic output for the failues. Task-number: QTBUG-35705 Change-Id: Iffebae89743c31e88125c0b1e21be172d3373b05 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2013-12-18 11:07:38 +00:00
QCOMPARE(snapModeSpy.count(), 1);
Support snapMode in PathView PathView missed out on snapMode, which is especially useful for its SnapOneItem mode. Change-Id: I0e9b080ef72d9bc1e305445cd8dfde8e21e4e3da Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-21 03:18:05 +00:00
QTRY_VERIFY(!pathview->isMoving()); // ensure stable
int currentIndex = pathview->currentIndex();
double startOffset = pathview->offset();
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
flick(window.data(), QPoint(200,10), QPoint(10,10), 180);
Support snapMode in PathView PathView missed out on snapMode, which is especially useful for its SnapOneItem mode. Change-Id: I0e9b080ef72d9bc1e305445cd8dfde8e21e4e3da Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-21 03:18:05 +00:00
QVERIFY(pathview->isMoving());
QTRY_VERIFY(!pathview->isMoving());
// must have moved only one item
QCOMPARE(pathview->offset(), fmodf(3.0 + startOffset - 1.0, 3.0));
if (enforceRange)
tst_qquickpathview: Use QCOMPARE instead of QVERIFY. Attempting to get some diagnostic output for the failues. Task-number: QTBUG-35705 Change-Id: Iffebae89743c31e88125c0b1e21be172d3373b05 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2013-12-18 11:07:38 +00:00
QCOMPARE(pathview->currentIndex(), currentIndex + 1);
Support snapMode in PathView PathView missed out on snapMode, which is especially useful for its SnapOneItem mode. Change-Id: I0e9b080ef72d9bc1e305445cd8dfde8e21e4e3da Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-21 03:18:05 +00:00
else
tst_qquickpathview: Use QCOMPARE instead of QVERIFY. Attempting to get some diagnostic output for the failues. Task-number: QTBUG-35705 Change-Id: Iffebae89743c31e88125c0b1e21be172d3373b05 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2013-12-18 11:07:38 +00:00
QCOMPARE(pathview->currentIndex(), currentIndex);
Changing PathView model after componentComplete should reset position If the model is changed after the component is completed, the offset and currentIndex should be reset to 0. Change-Id: Ie36eb0c17ce6602c6ae15b5ee7aeb8b1a6e7854b Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-18 00:36:17 +00:00
Support snapMode in PathView PathView missed out on snapMode, which is especially useful for its SnapOneItem mode. Change-Id: I0e9b080ef72d9bc1e305445cd8dfde8e21e4e3da Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-21 03:18:05 +00:00
}
void tst_QQuickPathView::snapOneItem_data()
{
QTest::addColumn<bool>("enforceRange");
QTest::newRow("no enforce range") << false;
QTest::newRow("enforce range") << true;
}
PathView was missing the maximumFlickVelocity property Change-Id: I0ed4ff0fe169187f7a8e03597be7407e9896100d Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-03-25 02:37:08 +00:00
Add methods to PathView: positionViewAtIndex(), indexAt(), itemAt() These methods are already present in ListView and GridView. Change-Id: I3777fccdecd77c8ab756a0062c71c6e1bfb749ef Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-23 01:08:06 +00:00
void tst_QQuickPathView::positionViewAtIndex()
{
QFETCH(bool, enforceRange);
QFETCH(int, pathItemCount);
QFETCH(qreal, initOffset);
QFETCH(int, index);
QFETCH(QQuickPathView::PositionMode, mode);
QFETCH(qreal, offset);
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
Add methods to PathView: positionViewAtIndex(), indexAt(), itemAt() These methods are already present in ListView and GridView. Change-Id: I3777fccdecd77c8ab756a0062c71c6e1bfb749ef Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-23 01:08:06 +00:00
window->setSource(testFileUrl("pathview3.qml"));
window->show();
All QWindow properties that have "window" in them have been renamed. Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase. Change-Id: I9614cc2c7ed119c663b3f6f99267483e291e529c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-19 16:05:01 +00:00
window->requestActivate();
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QVERIFY(QTest::qWaitForWindowActive(window.data()));
QCOMPARE(window.data(), qGuiApp->focusWindow());
Add methods to PathView: positionViewAtIndex(), indexAt(), itemAt() These methods are already present in ListView and GridView. Change-Id: I3777fccdecd77c8ab756a0062c71c6e1bfb749ef Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-23 01:08:06 +00:00
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Add methods to PathView: positionViewAtIndex(), indexAt(), itemAt() These methods are already present in ListView and GridView. Change-Id: I3777fccdecd77c8ab756a0062c71c6e1bfb749ef Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-23 01:08:06 +00:00
window->rootObject()->setProperty("enforceRange", enforceRange);
if (pathItemCount == -1)
pathview->resetPathItemCount();
else
pathview->setPathItemCount(pathItemCount);
pathview->setOffset(initOffset);
pathview->positionViewAtIndex(index, mode);
QCOMPARE(pathview->offset(), offset);
}
void tst_QQuickPathView::positionViewAtIndex_data()
{
QTest::addColumn<bool>("enforceRange");
QTest::addColumn<int>("pathItemCount");
QTest::addColumn<qreal>("initOffset");
QTest::addColumn<int>("index");
QTest::addColumn<QQuickPathView::PositionMode>("mode");
QTest::addColumn<qreal>("offset");
QTest::newRow("no range, all items, Beginning") << false << -1 << 0.0 << 3 << QQuickPathView::Beginning << 5.0;
QTest::newRow("no range, all items, Center") << false << -1 << 0.0 << 3 << QQuickPathView::Center << 1.0;
QTest::newRow("no range, all items, End") << false << -1 << 0.0 << 3 << QQuickPathView::End << 5.0;
QTest::newRow("no range, 5 items, Beginning") << false << 5 << 0.0 << 3 << QQuickPathView::Beginning << 5.0;
QTest::newRow("no range, 5 items, Center") << false << 5 << 0.0 << 3 << QQuickPathView::Center << 7.5;
QTest::newRow("no range, 5 items, End") << false << 5 << 0.0 << 3 << QQuickPathView::End << 2.0;
QTest::newRow("no range, 5 items, Contain") << false << 5 << 0.0 << 3 << QQuickPathView::Contain << 0.0;
QTest::newRow("no range, 5 items, init offset 4.0, Contain") << false << 5 << 4.0 << 3 << QQuickPathView::Contain << 5.0;
QTest::newRow("no range, 5 items, init offset 3.0, Contain") << false << 5 << 3.0 << 3 << QQuickPathView::Contain << 2.0;
QTest::newRow("strict range, all items, Beginning") << true << -1 << 0.0 << 3 << QQuickPathView::Beginning << 1.0;
QTest::newRow("strict range, all items, Center") << true << -1 << 0.0 << 3 << QQuickPathView::Center << 5.0;
QTest::newRow("strict range, all items, End") << true << -1 << 0.0 << 3 << QQuickPathView::End << 0.0;
QTest::newRow("strict range, all items, Contain") << true << -1 << 0.0 << 3 << QQuickPathView::Contain << 0.0;
QTest::newRow("strict range, all items, init offset 1.0, Contain") << true << -1 << 1.0 << 3 << QQuickPathView::Contain << 1.0;
QTest::newRow("strict range, all items, SnapPosition") << true << -1 << 0.0 << 3 << QQuickPathView::SnapPosition << 5.0;
QTest::newRow("strict range, 5 items, Beginning") << true << 5 << 0.0 << 3 << QQuickPathView::Beginning << 3.0;
QTest::newRow("strict range, 5 items, Center") << true << 5 << 0.0 << 3 << QQuickPathView::Center << 5.0;
QTest::newRow("strict range, 5 items, End") << true << 5 << 0.0 << 3 << QQuickPathView::End << 7.0;
QTest::newRow("strict range, 5 items, Contain") << true << 5 << 0.0 << 3 << QQuickPathView::Contain << 7.0;
QTest::newRow("strict range, 5 items, init offset 1.0, Contain") << true << 5 << 1.0 << 3 << QQuickPathView::Contain << 7.0;
QTest::newRow("strict range, 5 items, init offset 2.0, Contain") << true << 5 << 2.0 << 3 << QQuickPathView::Contain << 3.0;
QTest::newRow("strict range, 5 items, SnapPosition") << true << 5 << 0.0 << 3 << QQuickPathView::SnapPosition << 5.0;
}
void tst_QQuickPathView::indexAt_itemAt()
{
QFETCH(qreal, x);
QFETCH(qreal, y);
QFETCH(int, index);
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
Add methods to PathView: positionViewAtIndex(), indexAt(), itemAt() These methods are already present in ListView and GridView. Change-Id: I3777fccdecd77c8ab756a0062c71c6e1bfb749ef Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-23 01:08:06 +00:00
window->setSource(testFileUrl("pathview3.qml"));
window->show();
All QWindow properties that have "window" in them have been renamed. Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase. Change-Id: I9614cc2c7ed119c663b3f6f99267483e291e529c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-19 16:05:01 +00:00
window->requestActivate();
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QVERIFY(QTest::qWaitForWindowActive(window.data()));
QCOMPARE(window.data(), qGuiApp->focusWindow());
Add methods to PathView: positionViewAtIndex(), indexAt(), itemAt() These methods are already present in ListView and GridView. Change-Id: I3777fccdecd77c8ab756a0062c71c6e1bfb749ef Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-23 01:08:06 +00:00
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Add methods to PathView: positionViewAtIndex(), indexAt(), itemAt() These methods are already present in ListView and GridView. Change-Id: I3777fccdecd77c8ab756a0062c71c6e1bfb749ef Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-23 01:08:06 +00:00
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QQuickItem *item = nullptr;
Add methods to PathView: positionViewAtIndex(), indexAt(), itemAt() These methods are already present in ListView and GridView. Change-Id: I3777fccdecd77c8ab756a0062c71c6e1bfb749ef Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-23 01:08:06 +00:00
if (index >= 0) {
item = findItem<QQuickItem>(pathview, "wrapper", index);
QVERIFY(item);
}
QCOMPARE(pathview->indexAt(x,y), index);
tests/quick: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: Ib9f4c2486af23c47990be4b9e004b965de226dcc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-07-24 13:32:22 +00:00
QCOMPARE(pathview->itemAt(x,y), item);
Add methods to PathView: positionViewAtIndex(), indexAt(), itemAt() These methods are already present in ListView and GridView. Change-Id: I3777fccdecd77c8ab756a0062c71c6e1bfb749ef Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-23 01:08:06 +00:00
}
void tst_QQuickPathView::indexAt_itemAt_data()
{
QTest::addColumn<qreal>("x");
QTest::addColumn<qreal>("y");
QTest::addColumn<int>("index");
Fixed some auto tests In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-03-07 15:07:35 +00:00
QTest::newRow("Item 0 - 585, 95") << qreal(585.) << qreal(95.) << 0;
QTest::newRow("Item 0 - 660, 165") << qreal(660.) << qreal(165.) << 0;
QTest::newRow("No Item a - 580, 95") << qreal(580.) << qreal(95.) << -1;
QTest::newRow("No Item b - 585, 85") << qreal(585.) << qreal(85.) << -1;
QTest::newRow("Item 7 - 360, 200") << qreal(360.) << qreal(200.) << 7;
Add methods to PathView: positionViewAtIndex(), indexAt(), itemAt() These methods are already present in ListView and GridView. Change-Id: I3777fccdecd77c8ab756a0062c71c6e1bfb749ef Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-07-23 01:08:06 +00:00
}
Restore view to sensible position if grab is cancelled. If the mouse grab is stolen, return to allowed bounds. Change-Id: Icc44da32ff62bed273f0ccbb5498766981cdf9a4 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-03-15 04:58:03 +00:00
Add cacheItemCount property to PathView cacheItemCount specifies the number of items to cache off the path when pathItemCount is specified. This allows up to cacheItemCount items to be kept alive when they move off the path, and also to asynchronously create items off path in preparation for display when the path offset changes. This is the equivalent of cacheBuffer for other views. Task-number: QTBUG-23931 Change-Id: I03497537d3f929e5e3579536850dd43eb2724c38 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-08-21 04:47:48 +00:00
void tst_QQuickPathView::cacheItemCount()
{
Complete rewrite of threaded render loop. This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-05 14:27:47 +00:00
QScopedPointer<QQuickView> window(createView());
Add cacheItemCount property to PathView cacheItemCount specifies the number of items to cache off the path when pathItemCount is specified. This allows up to cacheItemCount items to be kept alive when they move off the path, and also to asynchronously create items off path in preparation for display when the path offset changes. This is the equivalent of cacheBuffer for other views. Task-number: QTBUG-23931 Change-Id: I03497537d3f929e5e3579536850dd43eb2724c38 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-08-21 04:47:48 +00:00
window->setSource(testFileUrl("pathview3.qml"));
window->show();
qApp->processEvents();
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Add cacheItemCount property to PathView cacheItemCount specifies the number of items to cache off the path when pathItemCount is specified. This allows up to cacheItemCount items to be kept alive when they move off the path, and also to asynchronously create items off path in preparation for display when the path offset changes. This is the equivalent of cacheBuffer for other views. Task-number: QTBUG-23931 Change-Id: I03497537d3f929e5e3579536850dd43eb2724c38 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-08-21 04:47:48 +00:00
QMetaObject::invokeMethod(pathview, "addColor", Q_ARG(QVariant, QString("orange")));
QMetaObject::invokeMethod(pathview, "addColor", Q_ARG(QVariant, QString("lightsteelblue")));
QMetaObject::invokeMethod(pathview, "addColor", Q_ARG(QVariant, QString("teal")));
QMetaObject::invokeMethod(pathview, "addColor", Q_ARG(QVariant, QString("aqua")));
pathview->setOffset(0);
pathview->setCacheItemCount(3);
tst_qquickpathview: Use QCOMPARE instead of QVERIFY. Attempting to get some diagnostic output for the failues. Task-number: QTBUG-35705 Change-Id: Iffebae89743c31e88125c0b1e21be172d3373b05 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2013-12-18 11:07:38 +00:00
QCOMPARE(pathview->cacheItemCount(), 3);
Add cacheItemCount property to PathView cacheItemCount specifies the number of items to cache off the path when pathItemCount is specified. This allows up to cacheItemCount items to be kept alive when they move off the path, and also to asynchronously create items off path in preparation for display when the path offset changes. This is the equivalent of cacheBuffer for other views. Task-number: QTBUG-23931 Change-Id: I03497537d3f929e5e3579536850dd43eb2724c38 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-08-21 04:47:48 +00:00
QQmlIncubationController controller;
window->engine()->setIncubationController(&controller);
// Items on the path are created immediately
QVERIFY(findItem<QQuickItem>(pathview, "wrapper", 0));
QVERIFY(findItem<QQuickItem>(pathview, "wrapper", 1));
QVERIFY(findItem<QQuickItem>(pathview, "wrapper", 11));
QVERIFY(findItem<QQuickItem>(pathview, "wrapper", 10));
const int cached[] = { 2, 3, 9, -1 }; // two appended, one prepended
int i = 0;
while (cached[i] >= 0) {
// items will be created one at a time
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(findItem<QQuickItem>(pathview, "wrapper", cached[i]) == nullptr);
QQuickItem *item = nullptr;
Add cacheItemCount property to PathView cacheItemCount specifies the number of items to cache off the path when pathItemCount is specified. This allows up to cacheItemCount items to be kept alive when they move off the path, and also to asynchronously create items off path in preparation for display when the path offset changes. This is the equivalent of cacheBuffer for other views. Task-number: QTBUG-23931 Change-Id: I03497537d3f929e5e3579536850dd43eb2724c38 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-08-21 04:47:48 +00:00
while (!item) {
Autotests: use std::atomic in incubateWhile() Followup to a9bf6e652aa99784343c94b0181c9443205e2a82 Change-Id: Ic010f2610177f93f8fc4e2312d6736c96390e585 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-05-13 09:11:23 +00:00
std::atomic<bool> b = false;
Add cacheItemCount property to PathView cacheItemCount specifies the number of items to cache off the path when pathItemCount is specified. This allows up to cacheItemCount items to be kept alive when they move off the path, and also to asynchronously create items off path in preparation for display when the path offset changes. This is the equivalent of cacheBuffer for other views. Task-number: QTBUG-23931 Change-Id: I03497537d3f929e5e3579536850dd43eb2724c38 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-08-21 04:47:48 +00:00
controller.incubateWhile(&b);
item = findItem<QQuickItem>(pathview, "wrapper", cached[i]);
}
++i;
}
{
Autotests: use std::atomic in incubateWhile() Followup to a9bf6e652aa99784343c94b0181c9443205e2a82 Change-Id: Ic010f2610177f93f8fc4e2312d6736c96390e585 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-05-13 09:11:23 +00:00
std::atomic<bool> b = true;
Add cacheItemCount property to PathView cacheItemCount specifies the number of items to cache off the path when pathItemCount is specified. This allows up to cacheItemCount items to be kept alive when they move off the path, and also to asynchronously create items off path in preparation for display when the path offset changes. This is the equivalent of cacheBuffer for other views. Task-number: QTBUG-23931 Change-Id: I03497537d3f929e5e3579536850dd43eb2724c38 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-08-21 04:47:48 +00:00
controller.incubateWhile(&b);
}
// move view and confirm items in view are visible immediately and outside are created async
pathview->setOffset(4);
// Items on the path are created immediately
QVERIFY(findItem<QQuickItem>(pathview, "wrapper", 6));
QVERIFY(findItem<QQuickItem>(pathview, "wrapper", 7));
QVERIFY(findItem<QQuickItem>(pathview, "wrapper", 8));
QVERIFY(findItem<QQuickItem>(pathview, "wrapper", 9));
// already created items within cache stay created
QVERIFY(findItem<QQuickItem>(pathview, "wrapper", 10));
QVERIFY(findItem<QQuickItem>(pathview, "wrapper", 11));
// one item prepended async.
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(findItem<QQuickItem>(pathview, "wrapper", 5) == nullptr);
QQuickItem *item = nullptr;
Add cacheItemCount property to PathView cacheItemCount specifies the number of items to cache off the path when pathItemCount is specified. This allows up to cacheItemCount items to be kept alive when they move off the path, and also to asynchronously create items off path in preparation for display when the path offset changes. This is the equivalent of cacheBuffer for other views. Task-number: QTBUG-23931 Change-Id: I03497537d3f929e5e3579536850dd43eb2724c38 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-08-21 04:47:48 +00:00
while (!item) {
Autotests: use std::atomic in incubateWhile() Followup to a9bf6e652aa99784343c94b0181c9443205e2a82 Change-Id: Ic010f2610177f93f8fc4e2312d6736c96390e585 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-05-13 09:11:23 +00:00
std::atomic<bool> b = false;
Add cacheItemCount property to PathView cacheItemCount specifies the number of items to cache off the path when pathItemCount is specified. This allows up to cacheItemCount items to be kept alive when they move off the path, and also to asynchronously create items off path in preparation for display when the path offset changes. This is the equivalent of cacheBuffer for other views. Task-number: QTBUG-23931 Change-Id: I03497537d3f929e5e3579536850dd43eb2724c38 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-08-21 04:47:48 +00:00
controller.incubateWhile(&b);
item = findItem<QQuickItem>(pathview, "wrapper", 5);
}
{
Autotests: use std::atomic in incubateWhile() Followup to a9bf6e652aa99784343c94b0181c9443205e2a82 Change-Id: Ic010f2610177f93f8fc4e2312d6736c96390e585 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-05-13 09:11:23 +00:00
std::atomic<bool> b = true;
Add cacheItemCount property to PathView cacheItemCount specifies the number of items to cache off the path when pathItemCount is specified. This allows up to cacheItemCount items to be kept alive when they move off the path, and also to asynchronously create items off path in preparation for display when the path offset changes. This is the equivalent of cacheBuffer for other views. Task-number: QTBUG-23931 Change-Id: I03497537d3f929e5e3579536850dd43eb2724c38 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-08-21 04:47:48 +00:00
controller.incubateWhile(&b);
}
Schedule layout changes to avoid refill() recursion. Otherwise we add duplicate item delegates. Task-number: QTBUG-40298 Change-Id: I8a2221d72f458c892720a71d87513808a5d725a6 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-07-21 12:55:30 +00:00
}
static void testCurrentIndexChange(QQuickPathView *pathView, const QStringList &objectNamesInOrder)
{
for (int visualIndex = 0; visualIndex < objectNamesInOrder.size() - 1; ++visualIndex) {
QQuickRectangle *delegate = findItem<QQuickRectangle>(pathView, objectNamesInOrder.at(visualIndex));
QVERIFY(delegate);
QQuickRectangle *nextDelegate = findItem<QQuickRectangle>(pathView, objectNamesInOrder.at(visualIndex + 1));
QVERIFY(nextDelegate);
QVERIFY(delegate->y() < nextDelegate->y());
}
}
void tst_QQuickPathView::changePathDuringRefill()
{
QScopedPointer<QQuickView> window(createView());
window->setSource(testFileUrl("changePathDuringRefill.qml"));
window->show();
QVERIFY(QTest::qWaitForWindowActive(window.data()));
QCOMPARE(window.data(), qGuiApp->focusWindow());
QQuickPathView *pathView = qobject_cast<QQuickPathView*>(window->rootObject());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathView != nullptr);
Schedule layout changes to avoid refill() recursion. Otherwise we add duplicate item delegates. Task-number: QTBUG-40298 Change-Id: I8a2221d72f458c892720a71d87513808a5d725a6 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-07-21 12:55:30 +00:00
testCurrentIndexChange(pathView, QStringList() << "delegateC" << "delegateA" << "delegateB");
pathView->incrementCurrentIndex();
/*
Decrementing moves delegateA down, resulting in an offset of 1,
so incrementing will move it up, resulting in an offset of 2:
Add cacheItemCount property to PathView cacheItemCount specifies the number of items to cache off the path when pathItemCount is specified. This allows up to cacheItemCount items to be kept alive when they move off the path, and also to asynchronously create items off path in preparation for display when the path offset changes. This is the equivalent of cacheBuffer for other views. Task-number: QTBUG-23931 Change-Id: I03497537d3f929e5e3579536850dd43eb2724c38 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-08-21 04:47:48 +00:00
Schedule layout changes to avoid refill() recursion. Otherwise we add duplicate item delegates. Task-number: QTBUG-40298 Change-Id: I8a2221d72f458c892720a71d87513808a5d725a6 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-07-21 12:55:30 +00:00
delegateC delegateA
delegateA => delegateB
delegateB delegateC
*/
QTRY_COMPARE(pathView->offset(), 2.0);
testCurrentIndexChange(pathView, QStringList() << "delegateA" << "delegateB" << "delegateC");
Add cacheItemCount property to PathView cacheItemCount specifies the number of items to cache off the path when pathItemCount is specified. This allows up to cacheItemCount items to be kept alive when they move off the path, and also to asynchronously create items off path in preparation for display when the path offset changes. This is the equivalent of cacheBuffer for other views. Task-number: QTBUG-23931 Change-Id: I03497537d3f929e5e3579536850dd43eb2724c38 Reviewed-by: Bea Lam <bea.lam@nokia.com>
2012-08-21 04:47:48 +00:00
}
Synchronize PathView gesture grabbing with other items. PathView didn't attempt to grab the gesture at the same event as other items. This prevented PathView from rightfully claiming the gesture before lower items in the stack. Use the same threshold test for PathView as used elsewhere. Task-number: QTBUG-37859 Change-Id: Ic57cb805ac979e41c3e35d86b2e7db781e61d69d Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-07-23 06:07:31 +00:00
void tst_QQuickPathView::nestedinFlickable()
Add autotest for incorrect steal of flick. Task-number: QTBUG-37859 Change-Id: I86aa231ba264569a21d0b6cd109096eb5dd7a2fe Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-03-26 19:32:29 +00:00
{
QScopedPointer<QQuickView> window(createView());
QQuickViewTestUtil::moveMouseAway(window.data());
Synchronize PathView gesture grabbing with other items. PathView didn't attempt to grab the gesture at the same event as other items. This prevented PathView from rightfully claiming the gesture before lower items in the stack. Use the same threshold test for PathView as used elsewhere. Task-number: QTBUG-37859 Change-Id: Ic57cb805ac979e41c3e35d86b2e7db781e61d69d Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-07-23 06:07:31 +00:00
window->setSource(testFileUrl("nestedInFlickable.qml"));
Add autotest for incorrect steal of flick. Task-number: QTBUG-37859 Change-Id: I86aa231ba264569a21d0b6cd109096eb5dd7a2fe Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-03-26 19:32:29 +00:00
window->show();
window->requestActivate();
QVERIFY(QTest::qWaitForWindowActive(window.data()));
QCOMPARE(window.data(), qGuiApp->focusWindow());
QQuickPathView *pathview = findItem<QQuickPathView>(window->rootObject(), "pathView");
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Add autotest for incorrect steal of flick. Task-number: QTBUG-37859 Change-Id: I86aa231ba264569a21d0b6cd109096eb5dd7a2fe Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-03-26 19:32:29 +00:00
QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(flickable != nullptr);
Add autotest for incorrect steal of flick. Task-number: QTBUG-37859 Change-Id: I86aa231ba264569a21d0b6cd109096eb5dd7a2fe Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-03-26 19:32:29 +00:00
QSignalSpy movingSpy(pathview, SIGNAL(movingChanged()));
QSignalSpy moveStartedSpy(pathview, SIGNAL(movementStarted()));
QSignalSpy moveEndedSpy(pathview, SIGNAL(movementEnded()));
QSignalSpy fflickingSpy(flickable, SIGNAL(flickingChanged()));
QSignalSpy fflickStartedSpy(flickable, SIGNAL(flickStarted()));
QSignalSpy fflickEndedSpy(flickable, SIGNAL(flickEnded()));
int waitInterval = 5;
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QTest::mousePress(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(23,218));
Add autotest for incorrect steal of flick. Task-number: QTBUG-37859 Change-Id: I86aa231ba264569a21d0b6cd109096eb5dd7a2fe Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-03-26 19:32:29 +00:00
QTest::mouseMove(window.data(), QPoint(25,218), waitInterval);
QTest::mouseMove(window.data(), QPoint(26,218), waitInterval);
QTest::mouseMove(window.data(), QPoint(28,219), waitInterval);
QTest::mouseMove(window.data(), QPoint(31,219), waitInterval);
Stabilize the drag related autotests for higher dpi displays Higher DPI displays might have a larger StartDragDistance (at least on X11), breaking the autotest on these displays. Change-Id: I9768a245a7654665dd9f718100289e9416d8c855 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2015-01-09 09:53:12 +00:00
QTest::mouseMove(window.data(), QPoint(53,219), waitInterval);
Add autotest for incorrect steal of flick. Task-number: QTBUG-37859 Change-Id: I86aa231ba264569a21d0b6cd109096eb5dd7a2fe Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-03-26 19:32:29 +00:00
// first move beyond threshold does not trigger drag
QVERIFY(!pathview->isMoving());
QVERIFY(!pathview->isDragging());
QCOMPARE(movingSpy.count(), 0);
QCOMPARE(moveStartedSpy.count(), 0);
QCOMPARE(moveEndedSpy.count(), 0);
QCOMPARE(fflickingSpy.count(), 0);
QCOMPARE(fflickStartedSpy.count(), 0);
QCOMPARE(fflickEndedSpy.count(), 0);
// no further moves after the initial move beyond threshold
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(73,219));
Add autotest for incorrect steal of flick. Task-number: QTBUG-37859 Change-Id: I86aa231ba264569a21d0b6cd109096eb5dd7a2fe Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-03-26 19:32:29 +00:00
QTRY_COMPARE(movingSpy.count(), 2);
QTRY_COMPARE(moveEndedSpy.count(), 1);
QCOMPARE(moveStartedSpy.count(), 1);
// Flickable should not handle this
QCOMPARE(fflickingSpy.count(), 0);
QCOMPARE(fflickStartedSpy.count(), 0);
QCOMPARE(fflickEndedSpy.count(), 0);
Prevent PathView's parent stealing mouse grab during double-flick This commit fixes an issue where mouse events could be stolen by the parent of a PathView due to the PathView not correctly setting the keep-mouse-grab flag in handleMousePressEvent(). This commit ensures that the flag is correctly set, so that the second flick in a double flick is handled by the PathView rather than being stolen by the parent. Task-number: QTBUG-59620 Change-Id: Iccdfe16e7e80e6d1d31f95c3dba9c8839b20f30f Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2017-05-02 06:25:37 +00:00
// now test that two quick flicks are both handled by the pathview
movingSpy.clear();
moveStartedSpy.clear();
moveEndedSpy.clear();
fflickingSpy.clear();
fflickStartedSpy.clear();
fflickEndedSpy.clear();
int shortInterval = 2;
Fix some warnings in tst_qquickpathview Change-Id: I5c3c6d418fb9f35ee684d6d7c548ba468b7f262c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-06-10 10:50:44 +00:00
QTest::mousePress(window.data(), Qt::LeftButton, {}, QPoint(23,216));
Prevent PathView's parent stealing mouse grab during double-flick This commit fixes an issue where mouse events could be stolen by the parent of a PathView due to the PathView not correctly setting the keep-mouse-grab flag in handleMousePressEvent(). This commit ensures that the flag is correctly set, so that the second flick in a double flick is handled by the PathView rather than being stolen by the parent. Task-number: QTBUG-59620 Change-Id: Iccdfe16e7e80e6d1d31f95c3dba9c8839b20f30f Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2017-05-02 06:25:37 +00:00
QTest::mouseMove(window.data(), QPoint(48,216), shortInterval);
Fix some warnings in tst_qquickpathview Change-Id: I5c3c6d418fb9f35ee684d6d7c548ba468b7f262c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-06-10 10:50:44 +00:00
QTest::mouseRelease(window.data(), Qt::LeftButton, {}, QPoint(73,217));
Prevent PathView's parent stealing mouse grab during double-flick This commit fixes an issue where mouse events could be stolen by the parent of a PathView due to the PathView not correctly setting the keep-mouse-grab flag in handleMousePressEvent(). This commit ensures that the flag is correctly set, so that the second flick in a double flick is handled by the PathView rather than being stolen by the parent. Task-number: QTBUG-59620 Change-Id: Iccdfe16e7e80e6d1d31f95c3dba9c8839b20f30f Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2017-05-02 06:25:37 +00:00
QVERIFY(pathview->isMoving());
Fix some warnings in tst_qquickpathview Change-Id: I5c3c6d418fb9f35ee684d6d7c548ba468b7f262c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-06-10 10:50:44 +00:00
QTest::mousePress(window.data(), Qt::LeftButton, {}, QPoint(21,216));
Prevent PathView's parent stealing mouse grab during double-flick This commit fixes an issue where mouse events could be stolen by the parent of a PathView due to the PathView not correctly setting the keep-mouse-grab flag in handleMousePressEvent(). This commit ensures that the flag is correctly set, so that the second flick in a double flick is handled by the PathView rather than being stolen by the parent. Task-number: QTBUG-59620 Change-Id: Iccdfe16e7e80e6d1d31f95c3dba9c8839b20f30f Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2017-05-02 06:25:37 +00:00
QTest::mouseMove(window.data(), QPoint(46,216), shortInterval);
Fix some warnings in tst_qquickpathview Change-Id: I5c3c6d418fb9f35ee684d6d7c548ba468b7f262c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-06-10 10:50:44 +00:00
QTest::mouseRelease(window.data(), Qt::LeftButton, {}, QPoint(71,217));
Prevent PathView's parent stealing mouse grab during double-flick This commit fixes an issue where mouse events could be stolen by the parent of a PathView due to the PathView not correctly setting the keep-mouse-grab flag in handleMousePressEvent(). This commit ensures that the flag is correctly set, so that the second flick in a double flick is handled by the PathView rather than being stolen by the parent. Task-number: QTBUG-59620 Change-Id: Iccdfe16e7e80e6d1d31f95c3dba9c8839b20f30f Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2017-05-02 06:25:37 +00:00
QVERIFY(pathview->isMoving());
// moveEndedSpy.count() and moveStartedSpy.count() should be exactly 1
// but in CI we sometimes see a scheduling issue being hit which
// causes the main thread to be stalled while the animation thread
// continues, allowing the animation timer to finish after the first
// call to QVERIFY(pathview->isMoving()) in the code above, prior to
// the detected beginning of the second flick, which can cause both of
// those signal counts to be 2 rather than 1.
// Note that this is not a true problem (this scheduling quirk just
// means that the unit test is not testing the enforced behavior
// as strictly as it would otherwise); it is only a bug if it results
// in the Flickable handling one or more of the flicks, and that
// is unconditionally tested below.
// To avoid false positive test failure in the scheduling quirk case
// we allow the multiple signal count case, rather than simply:
// QTRY_COMPARE(moveEndedSpy.count(), 1);
// QCOMPARE(moveStartedSpy.count(), 1);
QTRY_VERIFY(moveEndedSpy.count() > 0);
qCDebug(lcTests) << "After receiving moveEnded signal:"
<< "moveEndedSpy.count():" << moveEndedSpy.count()
<< "moveStartedSpy.count():" << moveStartedSpy.count()
<< "fflickingSpy.count():" << fflickingSpy.count()
<< "fflickStartedSpy.count():" << fflickStartedSpy.count()
<< "fflickEndedSpy.count():" << fflickEndedSpy.count();
QTRY_COMPARE(moveStartedSpy.count(), moveEndedSpy.count());
qCDebug(lcTests) << "After receiving matched moveEnded signal(s):"
<< "moveEndedSpy.count():" << moveEndedSpy.count()
<< "moveStartedSpy.count():" << moveStartedSpy.count()
<< "fflickingSpy.count():" << fflickingSpy.count()
<< "fflickStartedSpy.count():" << fflickStartedSpy.count()
<< "fflickEndedSpy.count():" << fflickEndedSpy.count();
QVERIFY(moveStartedSpy.count() <= 2);
// Flickable should not handle this
QCOMPARE(fflickingSpy.count(), 0);
QCOMPARE(fflickStartedSpy.count(), 0);
QCOMPARE(fflickEndedSpy.count(), 0);
Add autotest for incorrect steal of flick. Task-number: QTBUG-37859 Change-Id: I86aa231ba264569a21d0b6cd109096eb5dd7a2fe Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-03-26 19:32:29 +00:00
}
Fix incorrect behavior of PathView with ungrabMouse() When the grabbed Item is released and then grabbed again, if ungrabMouse () is called, the animation stops. In order to avoid this, when ungrabMouse () is called, if offset is different, it is modified to animate. Task-number: QTBUG-79592 Change-Id: I61cbd4dad90643722f12480f0dab3859ce116af8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-11-14 07:16:39 +00:00
void tst_QQuickPathView::ungrabNestedinFlickable()
{
QScopedPointer<QQuickView> window(createView());
QQuickViewTestUtil::moveMouseAway(window.data());
window->setSource(testFileUrl("ungrabNestedinFlickable.qml"));
window->show();
window->requestActivate();
QVERIFY(QTest::qWaitForWindowActive(window.data()));
QCOMPARE(window.data(), qGuiApp->focusWindow());
QQuickPathView *pathview = findItem<QQuickPathView>(window->rootObject(), "pathView");
QVERIFY(pathview != nullptr);
double pathviewOffsetBefore = pathview->offset();
// Drag slowly upwards so that it does not flick, release, and let it start snapping back
Fix some warnings in tst_qquickpathview Change-Id: I5c3c6d418fb9f35ee684d6d7c548ba468b7f262c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-06-10 10:50:44 +00:00
QTest::mousePress(window.data(), Qt::LeftButton, {}, QPoint(200, 350));
Fix incorrect behavior of PathView with ungrabMouse() When the grabbed Item is released and then grabbed again, if ungrabMouse () is called, the animation stops. In order to avoid this, when ungrabMouse () is called, if offset is different, it is modified to animate. Task-number: QTBUG-79592 Change-Id: I61cbd4dad90643722f12480f0dab3859ce116af8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-11-14 07:16:39 +00:00
for (int i = 0; i < 4; ++i)
QTest::mouseMove(window.data(), QPoint(200, 325 - i * 25), 500);
Fix some warnings in tst_qquickpathview Change-Id: I5c3c6d418fb9f35ee684d6d7c548ba468b7f262c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-06-10 10:50:44 +00:00
QTest::mouseRelease(window.data(), Qt::LeftButton, {}, QPoint(200, 250));
Fix incorrect behavior of PathView with ungrabMouse() When the grabbed Item is released and then grabbed again, if ungrabMouse () is called, the animation stops. In order to avoid this, when ungrabMouse () is called, if offset is different, it is modified to animate. Task-number: QTBUG-79592 Change-Id: I61cbd4dad90643722f12480f0dab3859ce116af8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-11-14 07:16:39 +00:00
QCOMPARE(pathview->isMoving(), true);
// Press again to stop moving
Fix some warnings in tst_qquickpathview Change-Id: I5c3c6d418fb9f35ee684d6d7c548ba468b7f262c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-06-10 10:50:44 +00:00
QTest::mousePress(window.data(), Qt::LeftButton, {}, QPoint(200, 350));
Fix incorrect behavior of PathView with ungrabMouse() When the grabbed Item is released and then grabbed again, if ungrabMouse () is called, the animation stops. In order to avoid this, when ungrabMouse () is called, if offset is different, it is modified to animate. Task-number: QTBUG-79592 Change-Id: I61cbd4dad90643722f12480f0dab3859ce116af8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-11-14 07:16:39 +00:00
QTRY_COMPARE(pathview->isMoving(), false);
// Cancel the grab, wait for movement to stop, and expect it to snap to
// the nearest delegate, which should be at the same offset as where we started
pathview->ungrabMouse();
QTRY_COMPARE(pathview->offset(), pathviewOffsetBefore);
QCOMPARE(pathview->isMoving(), false);
Fix some warnings in tst_qquickpathview Change-Id: I5c3c6d418fb9f35ee684d6d7c548ba468b7f262c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-06-10 10:50:44 +00:00
QTest::mouseRelease(window.data(), Qt::LeftButton, {}, QPoint(200, 350));
Fix incorrect behavior of PathView with ungrabMouse() When the grabbed Item is released and then grabbed again, if ungrabMouse () is called, the animation stops. In order to avoid this, when ungrabMouse () is called, if offset is different, it is modified to animate. Task-number: QTBUG-79592 Change-Id: I61cbd4dad90643722f12480f0dab3859ce116af8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-11-14 07:16:39 +00:00
}
Synchronize PathView gesture grabbing with other items. PathView didn't attempt to grab the gesture at the same event as other items. This prevented PathView from rightfully claiming the gesture before lower items in the stack. Use the same threshold test for PathView as used elsewhere. Task-number: QTBUG-37859 Change-Id: Ic57cb805ac979e41c3e35d86b2e7db781e61d69d Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-07-23 06:07:31 +00:00
void tst_QQuickPathView::flickableDelegate()
{
QScopedPointer<QQuickView> window(createView());
QQuickViewTestUtil::moveMouseAway(window.data());
window->setSource(testFileUrl("flickableDelegate.qml"));
window->show();
window->requestActivate();
QVERIFY(QTest::qWaitForWindowActive(window.data()));
QCOMPARE(window.data(), qGuiApp->focusWindow());
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Synchronize PathView gesture grabbing with other items. PathView didn't attempt to grab the gesture at the same event as other items. This prevented PathView from rightfully claiming the gesture before lower items in the stack. Use the same threshold test for PathView as used elsewhere. Task-number: QTBUG-37859 Change-Id: Ic57cb805ac979e41c3e35d86b2e7db781e61d69d Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-07-23 06:07:31 +00:00
QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(pathview->currentItem());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(flickable != nullptr);
Synchronize PathView gesture grabbing with other items. PathView didn't attempt to grab the gesture at the same event as other items. This prevented PathView from rightfully claiming the gesture before lower items in the stack. Use the same threshold test for PathView as used elsewhere. Task-number: QTBUG-37859 Change-Id: Ic57cb805ac979e41c3e35d86b2e7db781e61d69d Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-07-23 06:07:31 +00:00
QSignalSpy movingSpy(pathview, SIGNAL(movingChanged()));
QSignalSpy moveStartedSpy(pathview, SIGNAL(movementStarted()));
QSignalSpy moveEndedSpy(pathview, SIGNAL(movementEnded()));
QSignalSpy fflickingSpy(flickable, SIGNAL(flickingChanged()));
QSignalSpy fflickStartedSpy(flickable, SIGNAL(flickStarted()));
QSignalSpy fflickEndedSpy(flickable, SIGNAL(flickEnded()));
int waitInterval = 5;
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QTest::mousePress(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(23,100));
Synchronize PathView gesture grabbing with other items. PathView didn't attempt to grab the gesture at the same event as other items. This prevented PathView from rightfully claiming the gesture before lower items in the stack. Use the same threshold test for PathView as used elsewhere. Task-number: QTBUG-37859 Change-Id: Ic57cb805ac979e41c3e35d86b2e7db781e61d69d Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-07-23 06:07:31 +00:00
QTest::mouseMove(window.data(), QPoint(25,100), waitInterval);
QTest::mouseMove(window.data(), QPoint(26,100), waitInterval);
QTest::mouseMove(window.data(), QPoint(28,100), waitInterval);
QTest::mouseMove(window.data(), QPoint(31,100), waitInterval);
QTest::mouseMove(window.data(), QPoint(39,100), waitInterval);
// first move beyond threshold does not trigger drag
QVERIFY(!flickable->isMoving());
QVERIFY(!flickable->isDragging());
QCOMPARE(movingSpy.count(), 0);
QCOMPARE(moveStartedSpy.count(), 0);
QCOMPARE(moveEndedSpy.count(), 0);
QCOMPARE(fflickingSpy.count(), 0);
QCOMPARE(fflickStartedSpy.count(), 0);
QCOMPARE(fflickEndedSpy.count(), 0);
// no further moves after the initial move beyond threshold
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(53,100));
Synchronize PathView gesture grabbing with other items. PathView didn't attempt to grab the gesture at the same event as other items. This prevented PathView from rightfully claiming the gesture before lower items in the stack. Use the same threshold test for PathView as used elsewhere. Task-number: QTBUG-37859 Change-Id: Ic57cb805ac979e41c3e35d86b2e7db781e61d69d Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
2014-07-23 06:07:31 +00:00
QTRY_COMPARE(fflickingSpy.count(), 2);
QTRY_COMPARE(fflickStartedSpy.count(), 1);
QCOMPARE(fflickEndedSpy.count(), 1);
// PathView should not handle this
QTRY_COMPARE(movingSpy.count(), 0);
QTRY_COMPARE(moveEndedSpy.count(), 0);
QCOMPARE(moveStartedSpy.count(), 0);
}
Repeater & itemviews: fix setModel() JS array handling QVariant comparison in setModel() started failing because JS arrays are now passed as a QJSValue. Re-assigning the same array content should not trigger a model change. This change restores the old behavior it had before, when JS arrays were passed as QVariantLists. Change-Id: I1882b3531f2893b116dbd817edeecab1ae812ce8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-10-29 12:59:46 +00:00
void tst_QQuickPathView::jsArrayChange()
{
QQmlEngine engine;
QQmlComponent component(&engine);
component.setData("import QtQuick 2.4; PathView {}", QUrl());
QScopedPointer<QQuickPathView> view(qobject_cast<QQuickPathView *>(component.create()));
QVERIFY(!view.isNull());
QSignalSpy spy(view.data(), SIGNAL(modelChanged()));
QVERIFY(spy.isValid());
QJSValue array1 = engine.newArray(3);
QJSValue array2 = engine.newArray(3);
for (int i = 0; i < 3; ++i) {
array1.setProperty(i, i);
array2.setProperty(i, i);
}
view->setModel(QVariant::fromValue(array1));
QCOMPARE(spy.count(), 1);
// no change
view->setModel(QVariant::fromValue(array2));
QCOMPARE(spy.count(), 1);
}
PathView: fix infinite construction/destruction loop ... when all (or almost all) items are in the cache. When all items are in cache, check lower bound is equal to upper_bound. In rare cases, especially when almost all items are in cache, the inserting code was used (not only appending and prepending). In this code there was not bound check before creation of item and there was such situation: 1. Create item by inserting code (without bound check) 2. At the next call of refill() remove this item by life cycle because this item does not meet the conditions. And go to step 1. In other words at the first call we create some item, at the second remove this item. And again. So we had infinite construction/destruction loop. To break it we should check position of new item before creation in inserting code too (like we do in appending and prepending code). Task-number: QTBUG-37815 Change-Id: I015cdeb67ca5fcd06c34b3145b49cbd3e38d4078 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2016-05-26 11:45:31 +00:00
void tst_QQuickPathView::qtbug37815()
{
QScopedPointer<QQuickView> window(createView());
window->setSource(testFileUrl("qtbug37815.qml"));
window->show();
window->requestActivate();
QVERIFY(QTest::qWaitForWindowActive(window.data()));
// cache items will be created async. Let's wait...
QTest::qWait(1000);
QQuickPathView *pathView = findItem<QQuickPathView>(window->rootObject(), "pathView");
Replace remaining Q_NULLPTR with nullptr Change-Id: I28a32af7f1c306a3002d47025a842475f848c1a4 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-10-06 09:38:59 +00:00
QVERIFY(pathView != nullptr);
PathView: fix infinite construction/destruction loop ... when all (or almost all) items are in the cache. When all items are in cache, check lower bound is equal to upper_bound. In rare cases, especially when almost all items are in cache, the inserting code was used (not only appending and prepending). In this code there was not bound check before creation of item and there was such situation: 1. Create item by inserting code (without bound check) 2. At the next call of refill() remove this item by life cycle because this item does not meet the conditions. And go to step 1. In other words at the first call we create some item, at the second remove this item. And again. So we had infinite construction/destruction loop. To break it we should check position of new item before creation in inserting code too (like we do in appending and prepending code). Task-number: QTBUG-37815 Change-Id: I015cdeb67ca5fcd06c34b3145b49cbd3e38d4078 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2016-05-26 11:45:31 +00:00
const int pathItemCount = pathView->pathItemCount();
const int cacheItemCount = pathView->cacheItemCount();
int totalCount = 0;
foreach (QQuickItem *item, pathView->childItems()) {
if (item->objectName().startsWith(QLatin1String("delegate")))
++totalCount;
}
QCOMPARE(pathItemCount + cacheItemCount, totalCount);
}
Remove ordered list assumptions in PathView When flicking fast or jumping around on paths with some items not seen, the current algorithm makes assumptions about list ordering which are hard to maintain. Specifically that it has the index of the first item in the list cached and that all changed will be to either prepend or append an item to the current ordered set. This patch removes that assumption, leading to a little more work each time to identify where new elements will go. There is still a slightly faster path for the common case of adding elements to the beginning or end of the path. Task-number: QTBUG-42716 Change-Id: Ief76c93967d254d405e6656ef27d06b4ecc470c8 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2015-05-07 05:56:03 +00:00
/* This bug was one where if you jump the list such that the sole missing item needed to be
* added in the middle of the list, it would instead move an item somewhere else in the list
* to the middle (messing it up very badly).
*
* The test checks correct visual order both before and after the jump.
*/
void tst_QQuickPathView::qtbug42716()
{
QScopedPointer<QQuickView> window(createView());
window->setSource(testFileUrl("qtbug42716.qml"));
window->show();
QVERIFY(QTest::qWaitForWindowActive(window.data()));
QCOMPARE(window.data(), qGuiApp->focusWindow());
QQuickPathView *pathView = findItem<QQuickPathView>(window->rootObject(), "pathView");
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathView != nullptr);
Remove ordered list assumptions in PathView When flicking fast or jumping around on paths with some items not seen, the current algorithm makes assumptions about list ordering which are hard to maintain. Specifically that it has the index of the first item in the list cached and that all changed will be to either prepend or append an item to the current ordered set. This patch removes that assumption, leading to a little more work each time to identify where new elements will go. There is still a slightly faster path for the common case of adding elements to the beginning or end of the path. Task-number: QTBUG-42716 Change-Id: Ief76c93967d254d405e6656ef27d06b4ecc470c8 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2015-05-07 05:56:03 +00:00
int order1[] = {5,6,7,0,1,2,3};
int missing1 = 4;
int order2[] = {0,1,2,3,4,5,6};
int missing2 = 7;
qreal lastY = 0.0;
for (int i = 0; i<7; i++) {
QQuickItem *item = findItem<QQuickItem>(pathView, QString("delegate%1").arg(order1[i]));
QVERIFY(item);
QVERIFY(item->y() > lastY);
lastY = item->y();
}
QQuickItem *itemMiss = findItem<QQuickItem>(pathView, QString("delegate%1").arg(missing1));
QVERIFY(!itemMiss);
pathView->setOffset(0.0882353);
//Note refill is delayed, needs time to take effect
QTest::qWait(100);
lastY = 0.0;
for (int i = 0; i<7; i++) {
QQuickItem *item = findItem<QQuickItem>(pathView, QString("delegate%1").arg(order2[i]));
QVERIFY(item);
QVERIFY(item->y() > lastY);
lastY = item->y();
}
itemMiss = findItem<QQuickItem>(pathView, QString("delegate%1").arg(missing2));
QVERIFY(!itemMiss);
}
PathView: fix item creation First call of QQuickPathView::refill() did not use currentIndex for item prepending and there was situation when items were not created, e.g.: PathView with current item in center and currentIndex was set so that item with index 0 was after current item and before path end. The result of this situation: items from path begin to current item were not created. The reason was that idx always equaled (modelCount-1) for item prepending. Now first filling uses currentIndex to calculate valid idx. Task-number: QTBUG-53464 Change-Id: I7e343b0712c9c5c5cd56b1d8e020cf8c0f6e6301 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2016-05-24 09:21:39 +00:00
void tst_QQuickPathView::qtbug53464()
{
QScopedPointer<QQuickView> window(createView());
window->setSource(testFileUrl("qtbug53464.qml"));
window->show();
window->requestActivate();
QVERIFY(QTest::qWaitForWindowActive(window.data()));
QQuickPathView *pathView = findItem<QQuickPathView>(window->rootObject(), "pathView");
Replace remaining Q_NULLPTR with nullptr Change-Id: I28a32af7f1c306a3002d47025a842475f848c1a4 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-10-06 09:38:59 +00:00
QVERIFY(pathView != nullptr);
PathView: fix item creation First call of QQuickPathView::refill() did not use currentIndex for item prepending and there was situation when items were not created, e.g.: PathView with current item in center and currentIndex was set so that item with index 0 was after current item and before path end. The result of this situation: items from path begin to current item were not created. The reason was that idx always equaled (modelCount-1) for item prepending. Now first filling uses currentIndex to calculate valid idx. Task-number: QTBUG-53464 Change-Id: I7e343b0712c9c5c5cd56b1d8e020cf8c0f6e6301 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2016-05-24 09:21:39 +00:00
const int currentIndex = pathView->currentIndex();
QCOMPARE(currentIndex, 8);
const int pathItemCount = pathView->pathItemCount();
int totalCount = 0;
foreach (QQuickItem *item, pathView->childItems()) {
if (item->objectName().startsWith(QLatin1String("delegate")))
++totalCount;
}
QCOMPARE(pathItemCount, totalCount);
}
Clear stringCache explicitly instead of asserting its emptiness. This assumption does not hold when PathView's path.pathElements list is updated with new contents at runtime. Task-number: QTBUG-46255 Change-Id: I6b0d7ee8ee2d67ca0138eacdf0ad221338f788e4 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2015-05-21 07:52:49 +00:00
void tst_QQuickPathView::addCustomAttribute()
{
const QScopedPointer<QQuickView> window(createView());
window->setSource(testFileUrl("customAttribute.qml"));
window->show();
}
Quick: expose movementDirection of PathView It is needed by the behavior of TabBar in universal style in QtQC2. [ChangeLog][QtQuick][PathView] Added movementDirection property Change-Id: Iedc214a12e7336e52125ec82b9ded45502905978 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
2016-04-26 12:12:14 +00:00
void tst_QQuickPathView::movementDirection_data()
{
QTest::addColumn<QQuickPathView::MovementDirection>("movementdirection");
QTest::addColumn<int>("toidx");
QTest::addColumn<qreal>("fromoffset");
QTest::addColumn<qreal>("tooffset");
QTest::newRow("default-shortest") << QQuickPathView::Shortest << 3 << 8.0 << 5.0;
QTest::newRow("negative") << QQuickPathView::Negative << 2 << 0.0 << 6.0;
QTest::newRow("positive") << QQuickPathView::Positive << 3 << 8.0 << 5.0;
}
static void verify_offsets(QQuickPathView *pathview, int toidx, qreal fromoffset, qreal tooffset)
{
pathview->setCurrentIndex(toidx);
bool started = false;
qreal first, second;
QTest::qWait(100);
first = pathview->offset();
while (1) {
test: fix flaky in tst_QQuickPathView::movementDirection() Due to heavy load in ci test vm, the animation perhaps didn't start after QTest::qWait(100). Task-number: QTBUG-67939 Change-Id: I8c786c82ea41c3d3514ab6bddaefb0c584f35fe0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-04-26 12:08:52 +00:00
if (first == 0)
first = pathview->offset();
Quick: expose movementDirection of PathView It is needed by the behavior of TabBar in universal style in QtQC2. [ChangeLog][QtQuick][PathView] Added movementDirection property Change-Id: Iedc214a12e7336e52125ec82b9ded45502905978 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
2016-04-26 12:12:14 +00:00
QTest::qWait(10); // highlightMoveDuration: 1000
second = pathview->offset();
test: fix flaky in tst_QQuickPathView::movementDirection() Due to heavy load in ci test vm, the animation perhaps didn't start after QTest::qWait(100). Task-number: QTBUG-67939 Change-Id: I8c786c82ea41c3d3514ab6bddaefb0c584f35fe0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-04-26 12:08:52 +00:00
if (!started && first != 0 && second != first) { // animation started
Quick: expose movementDirection of PathView It is needed by the behavior of TabBar in universal style in QtQC2. [ChangeLog][QtQuick][PathView] Added movementDirection property Change-Id: Iedc214a12e7336e52125ec82b9ded45502905978 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
2016-04-26 12:12:14 +00:00
started = true;
break;
}
}
if (tooffset > fromoffset) {
QVERIFY(fromoffset <= first);
QVERIFY(first <= second);
QVERIFY(second <= tooffset);
} else {
QVERIFY(fromoffset >= first);
QVERIFY(first >= second);
QVERIFY(second >= tooffset);
}
QTRY_COMPARE(pathview->offset(), tooffset);
}
void tst_QQuickPathView::movementDirection()
{
QFETCH(QQuickPathView::MovementDirection, movementdirection);
QFETCH(int, toidx);
QFETCH(qreal, fromoffset);
QFETCH(qreal, tooffset);
QScopedPointer<QQuickView> window(createView());
QQuickViewTestUtil::moveMouseAway(window.data());
window->setSource(testFileUrl("movementDirection.qml"));
window->show();
window->requestActivate();
QVERIFY(QTest::qWaitForWindowActive(window.data()));
QCOMPARE(window.data(), qGuiApp->focusWindow());
QQuickPathView *pathview = window->rootObject()->findChild<QQuickPathView*>("view");
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
Quick: expose movementDirection of PathView It is needed by the behavior of TabBar in universal style in QtQC2. [ChangeLog][QtQuick][PathView] Added movementDirection property Change-Id: Iedc214a12e7336e52125ec82b9ded45502905978 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
2016-04-26 12:12:14 +00:00
QVERIFY(pathview->offset() == 0.0);
QVERIFY(pathview->currentIndex() == 0);
pathview->setMovementDirection(movementdirection);
QVERIFY(pathview->movementDirection() == movementdirection);
verify_offsets(pathview, toidx, fromoffset, tooffset);
}
PathView: fix crash on path remove There was no check if new path is a valid object Task-number: QTBUG-53917 Change-Id: I2fd9534c1d34633243d16eda56a2b07e18dabe16 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
2016-12-28 22:40:11 +00:00
void tst_QQuickPathView::removePath()
{
QScopedPointer<QQuickView> window(createView());
window->setSource(testFileUrl("removePath.qml"));
window->show();
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-21 09:41:54 +00:00
QVERIFY(pathview != nullptr);
PathView: fix crash on path remove There was no check if new path is a valid object Task-number: QTBUG-53917 Change-Id: I2fd9534c1d34633243d16eda56a2b07e18dabe16 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
2016-12-28 22:40:11 +00:00
QVERIFY(QMetaObject::invokeMethod(pathview, "removePath"));
QVERIFY(QMetaObject::invokeMethod(pathview, "setPath"));
}
QQuickPathViewPrivate: fix heap-use-after-free The TabBar auto tests in Qt Quick Controls 2 repeats the following process very quickly for several data rows: 1. Creates a TabBar (PathView, when using the Universal style) 2. Moves items in its QQmlObjectModel 3. Deletes the TabBar When run with ASAN, this test would fail, because the TabButtons (which are child items of the PathView) would try to access a deleted QQuickItemChangeListener upon their destruction. The underlying issue is that QQuickPathView::modelUpdated() is called, and before a refill() can happen, the view is deleted. QQuickPathView::refill() was the only execution path that was releasing the cached items (QQuickPathViewPrivate::itemCache), and since part of releasing an item involves removing the QQuickPathView as a change listener from the item, the item would access the deleted view (listener) when the item was being destroyed. This patch fixes the issue by also releasing cached items in QQuickPathViewPrivate::clear(), which is always called by the destructor. Task-number: QTBUG-68964 Change-Id: Ic5bf0943be79948c86bf7c07ef13ecd1a7b971ba Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
2018-06-19 14:04:24 +00:00
/*
Tests that moving items in an ObjectModel and then deleting the view
doesn't cause heap-use-after-free when run through ASAN.
The test case is based on a Qt Quick Controls 2 test where the issue was
discovered.
*/
void tst_QQuickPathView::objectModelMove()
{
QScopedPointer<QQuickView> window(createView());
window->setSource(testFileUrl("objectModelMove.qml"));
window->show();
// Create the view.
QVERIFY(QMetaObject::invokeMethod(window->rootObject(), "newView"));
QPointer<QQuickPathView> pathView = window->rootObject()->property("pathViewItem").value<QQuickPathView*>();
QVERIFY(pathView);
QCOMPARE(pathView->count(), 3);
pathView->highlightItem()->setObjectName("highlight");
// Move an item from index 0 to 1.
QVERIFY(QMetaObject::invokeMethod(window->rootObject(), "move"));
QCOMPARE(pathView->count(), 3);
// Keep track of the amount of listeners
QVector<QString> itemObjectNames;
itemObjectNames << QLatin1String("red") << QLatin1String("green") << QLatin1String("blue");
QVector<QQuickItem*> childItems;
Fix some warnings in tst_qquickpathview Change-Id: I5c3c6d418fb9f35ee684d6d7c548ba468b7f262c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-06-10 10:50:44 +00:00
for (const QString &itemObjectName : qAsConst(itemObjectNames)) {
QQuickPathViewPrivate: fix heap-use-after-free The TabBar auto tests in Qt Quick Controls 2 repeats the following process very quickly for several data rows: 1. Creates a TabBar (PathView, when using the Universal style) 2. Moves items in its QQmlObjectModel 3. Deletes the TabBar When run with ASAN, this test would fail, because the TabButtons (which are child items of the PathView) would try to access a deleted QQuickItemChangeListener upon their destruction. The underlying issue is that QQuickPathView::modelUpdated() is called, and before a refill() can happen, the view is deleted. QQuickPathView::refill() was the only execution path that was releasing the cached items (QQuickPathViewPrivate::itemCache), and since part of releasing an item involves removing the QQuickPathView as a change listener from the item, the item would access the deleted view (listener) when the item was being destroyed. This patch fixes the issue by also releasing cached items in QQuickPathViewPrivate::clear(), which is always called by the destructor. Task-number: QTBUG-68964 Change-Id: Ic5bf0943be79948c86bf7c07ef13ecd1a7b971ba Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
2018-06-19 14:04:24 +00:00
QQuickItem *childItem = findItem<QQuickItem>(pathView, itemObjectName);
QVERIFY(childItem);
childItems.append(childItem);
}
// Destroy the view (via destroy()).
QVERIFY(QMetaObject::invokeMethod(window->rootObject(), "destroyView"));
// Ensure that the view has been destroyed. This check is also necessary in order for
// ASAN to complain (it will complain after the test function has finished).
QTRY_VERIFY(pathView.isNull());
// By this point, all of its cached items should have been released,
// which means none of the items should have any listeners.
for (const auto childItem : qAsConst(childItems)) {
const QQuickItemPrivate *childItemPrivate = QQuickItemPrivate::get(childItem);
QCOMPARE(childItemPrivate->changeListeners.size(), 0);
}
}
Support required properties in model delegates If a delegates declares a required property of a given name, and that name exists as a role in the model, we set the property accordingly. The same holds true for the special properties that come from the QQmlDelegateModel like "index" and "model". All roles are still injected into scope and thus accessible; changing this in Qt5 would be tedious or even impossible while still maintaining backwardscompatibility with delegates that do not use required properties. Change-Id: I4f388ba549c42f1ff9822bdb3b8357c4d45e4b66 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-08-15 08:03:57 +00:00
void tst_QQuickPathView::requiredPropertiesInDelegate()
{
{
QTest::ignoreMessage(QtMsgType::QtInfoMsg, "Bill JonesBerlin0");
QTest::ignoreMessage(QtMsgType::QtInfoMsg, "Jane DoeOslo1");
QTest::ignoreMessage(QtMsgType::QtInfoMsg, "John SmithOulo2");
QScopedPointer<QQuickView> window(createView());
window->setSource(testFileUrl("delegateWithRequiredProperties.qml"));
window->show();
}
{
QScopedPointer<QQuickView> window(createView());
window->setSource(testFileUrl("delegateWithRequiredProperties.2.qml"));
window->show();
QTRY_VERIFY(window->rootObject()->property("working").toBool());
}
Required properties: Break binding to model on write This mirrors the behavior in other parts of QML where writing to a property in imperative code breaks the binding. Change-Id: Id19eef17a3c5e77bc4c2772bd749b38c732606a8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-09-17 12:00:42 +00:00
{
QScopedPointer<QQuickView> window(createView());
QTest::ignoreMessage(QtMsgType::QtWarningMsg, QRegularExpression("Writing to \"name\" broke the binding to the underlying model"));
window->setSource(testFileUrl("delegateWithRequiredProperties.3.qml"));
window->show();
QTRY_VERIFY(window->rootObject()->property("working").toBool());
}
Support required properties in model delegates If a delegates declares a required property of a given name, and that name exists as a role in the model, we set the property accordingly. The same holds true for the special properties that come from the QQmlDelegateModel like "index" and "model". All roles are still injected into scope and thus accessible; changing this in Qt5 would be tedious or even impossible while still maintaining backwardscompatibility with delegates that do not use required properties. Change-Id: I4f388ba549c42f1ff9822bdb3b8357c4d45e4b66 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-08-15 08:03:57 +00:00
}
void tst_QQuickPathView::requiredPropertiesInDelegatePreventUnrelated()
{
QTest::ignoreMessage(QtMsgType::QtInfoMsg, "ReferenceError");
QTest::ignoreMessage(QtMsgType::QtInfoMsg, "ReferenceError");
QTest::ignoreMessage(QtMsgType::QtInfoMsg, "ReferenceError");
QScopedPointer<QQuickView> window(createView());
window->setSource(testFileUrl("delegatewithUnrelatedRequiredPreventsAccessToModel.qml"));
window->show();
}
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
QTEST_MAIN(tst_QQuickPathView)
Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 12:13:26 +00:00
Rename Qt Quick-specific classes to QQuick* The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-14 08:51:42 +00:00
#include "tst_qquickpathview.moc"