diff options
author | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-08-07 13:57:50 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@digia.com> | 2014-08-08 19:28:34 +0200 |
commit | 60ed6a433a1d51d5ca7ccdeff3fce55e2350d20c (patch) | |
tree | 494b2eced9e2665aa0fc8e3546d2fc1230fc1663 /tests/auto/quick/qquickwindow | |
parent | b4b27168ac03d61f6dfa146c9262df44097eadfe (diff) |
Add Window attached property on Item
An Item sometimes needs to know a few things about the window
in which it is being displayed; this attached property can expose
them without needing to go up the heirarchy to find the window.
Instead of adding the QQuickWindow pointer as a property on Item
as in 8f49f50a169db85401eb37daf4fe3a0fc3280603, having an attached
property means that it will not be found by introspection; and
it solves the problem that Window is in the QtQuick.Window module:
you must import the module to use the attached property, instead
of having access to a pointer whose type might not be defined
if you didn't import it. The Window attached property is created
on-demand (so the memory cost adds up if you use it in too many
places); the tradeoff is that it can exist even when the item
is not yet being shown in a window, so bindings at startup work.
The API is purposely incomplete compared to that in QQuickWindow
so that we can introduce what is needed in a controlled fasion
over time. For now we know of use cases for visibility, active
and activeFocusItem.
[ChangeLog][QtQuick][Window] Added Item.Window attached property
Change-Id: I649404cbd1383326678aa2144f790b2f2542dbbc
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'tests/auto/quick/qquickwindow')
-rw-r--r-- | tests/auto/quick/qquickwindow/data/windowattached.qml | 25 | ||||
-rw-r--r-- | tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 21 |
2 files changed, 46 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickwindow/data/windowattached.qml b/tests/auto/quick/qquickwindow/data/windowattached.qml new file mode 100644 index 0000000000..e000d5c6fd --- /dev/null +++ b/tests/auto/quick/qquickwindow/data/windowattached.qml @@ -0,0 +1,25 @@ +import QtQuick 2.4 +import QtQuick.Window 2.2 + +Rectangle { + id: root + width: 100 + height: 100 + property bool windowActive: root.Window.active + Text { + objectName: "rectangleWindowText" + anchors.centerIn: parent + text: (windowActive ? "active" : "inactive") + "\nvisibility: " + root.Window.visibility + } + + property Window extraWindow: Window { + objectName: "extraWindow" + title: "extra window" + visible: true + Text { + objectName: "extraWindowText" + anchors.centerIn: parent + text: (extraWindow.active ? "active" : "inactive") + "\nvisibility: " + Window.visibility + } + } +} diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index 7b23d144a9..b8e36b06fb 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -43,6 +43,7 @@ #include <QDebug> #include <QTouchEvent> #include <QtQuick/QQuickItem> +#include <QtQuick/QQuickView> #include <QtQuick/QQuickWindow> #include <QtQml/QQmlEngine> #include <QtQml/QQmlComponent> @@ -368,6 +369,8 @@ private slots: void defaultSurfaceFormat(); void glslVersion(); + void attachedProperty(); + void testRenderJob(); private: @@ -1974,6 +1977,24 @@ void tst_qquickwindow::glslVersion() } } +void tst_qquickwindow::attachedProperty() +{ + QQuickView view(testFileUrl("windowattached.qml")); + view.show(); + view.requestActivate(); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QVERIFY(view.rootObject()->property("windowActive").toBool()); + + QQuickWindow *innerWindow = view.rootObject()->findChild<QQuickWindow*>("extraWindow"); + QVERIFY(innerWindow); + innerWindow->requestActivate(); + QVERIFY(QTest::qWaitForWindowActive(innerWindow)); + + QQuickText *text = view.rootObject()->findChild<QQuickText*>("extraWindowText"); + QVERIFY(text); + QCOMPARE(text->text(), QLatin1String("active\nvisibility: 2")); +} + class RenderJob : public QRunnable { public: |