diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-29 15:50:39 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-11-02 15:23:50 +0000 |
| commit | 497ac61380d4b6ebfef88923131f61d648857943 (patch) | |
| tree | 90f8cb1c4de949ffacedac5c23427508814d1b3b /src/templates/qquickstackview.cpp | |
| parent | 2ee0e8770bf43182aae7fd4420e7bd986ecdd68e (diff) | |
Fix StackView::busy and child event filtering
1) renamed busy() to isBusy() to follow the Qt convention :)
2) fixed spurious busyChanged() emissions (it was always emitted on
push/replace/pop even when the state didn't change (null transitions)
3) with null transitions, the child event filter was never turned off
and therefore StackView "froze" after the first push/replace/pop
Change-Id: I07fffa73db5a182865c7b2779641e1f95ed8b30b
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/templates/qquickstackview.cpp')
| -rw-r--r-- | src/templates/qquickstackview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/templates/qquickstackview.cpp b/src/templates/qquickstackview.cpp index 075830a4..2dcae1a1 100644 --- a/src/templates/qquickstackview.cpp +++ b/src/templates/qquickstackview.cpp @@ -292,10 +292,10 @@ QQuickStackAttached *QQuickStackView::qmlAttachedProperties(QObject *object) \readonly This property holds whether a transition is running. */ -bool QQuickStackView::busy() const +bool QQuickStackView::isBusy() const { Q_D(const QQuickStackView); - return d->transitioner && !d->transitioner->runningJobs.isEmpty(); + return d->busy; } /*! |