summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@digia.com>2013-12-05 13:18:34 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-07 11:42:06 +0100
commitc9106ad03240df39ca3cace1cf46ab69b3ce7b54 (patch)
treec6cdfee376abefc34a36fefd2fc8e6f63be6ec09 /src
parent4c3196c979d9a7f46b3f37b14140026dd74bf79a (diff)
downloadqtquickcontrols-c9106ad03240df39ca3cace1cf46ab69b3ce7b54.tar.gz
qtquickcontrols-c9106ad03240df39ca3cace1cf46ab69b3ce7b54.tar.bz2
qtquickcontrols-c9106ad03240df39ca3cace1cf46ab69b3ce7b54.zip
Don't animate the busy indicator when it is not showing.
Change-Id: Ia53d8d46e0397ab94048c85245997be63960dc67 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/controls/Styles/Base/BusyIndicatorStyle.qml3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/controls/Styles/Base/BusyIndicatorStyle.qml b/src/controls/Styles/Base/BusyIndicatorStyle.qml
index d53ccb29..d9f0fdb4 100644
--- a/src/controls/Styles/Base/BusyIndicatorStyle.qml
+++ b/src/controls/Styles/Base/BusyIndicatorStyle.qml
@@ -77,6 +77,8 @@ Style {
/*! This defines the appearance of the busy indicator. */
property Component indicator: Item {
+ id: indicatorItem
+
implicitWidth: 48
implicitHeight: 48
@@ -96,6 +98,7 @@ Style {
loops: Animation.Infinite
from: 0
to: 360
+ running: indicatorItem.visible && (control.running || indicatorItem.opacity > 0);
}
}
}