diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-15 16:14:22 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-15 16:14:22 +0200 |
| commit | b58ec3b086518da5aa573f99426235854c23e35f (patch) | |
| tree | 861a9935d8f1cdba2fdca546836a351736dbddbf /src/quickcontrols/fusion | |
| parent | 4826f86e274f1b29bd769e6790824f9e62a40f62 (diff) | |
| parent | 22032227d16c39211e2ebceef97d21f4d89c7c87 (diff) | |
Merge tag 'v6.5.8-lts-lgpl' into 6.56.5
Qt 6.5.8-lts-lgpl release
Diffstat (limited to 'src/quickcontrols/fusion')
| -rw-r--r-- | src/quickcontrols/fusion/impl/qquickfusionbusyindicator.cpp | 12 | ||||
| -rw-r--r-- | src/quickcontrols/fusion/impl/qquickfusionbusyindicator_p.h | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/quickcontrols/fusion/impl/qquickfusionbusyindicator.cpp b/src/quickcontrols/fusion/impl/qquickfusionbusyindicator.cpp index 8e58b09ed3..ddf26140ce 100644 --- a/src/quickcontrols/fusion/impl/qquickfusionbusyindicator.cpp +++ b/src/quickcontrols/fusion/impl/qquickfusionbusyindicator.cpp @@ -33,10 +33,13 @@ bool QQuickFusionBusyIndicator::isRunning() const void QQuickFusionBusyIndicator::setRunning(bool running) { - if (running) { + m_running = running; + + if (m_running) { setVisible(true); update(); } + // Don't set visible to false if not running, because we use an opacity animation (in QML) to hide ourselves. } void QQuickFusionBusyIndicator::paint(QPainter *painter) @@ -73,7 +76,12 @@ void QQuickFusionBusyIndicator::itemChange(ItemChange change, const ItemChangeDa switch (change) { case ItemOpacityHasChanged: - if (qFuzzyIsNull(data.realValue)) + // If running is set to false and then true within a short period (QTBUG-85860), our + // OpacityAnimator cancels the 1 => 0 animation (which was for running being set to false), + // setting opacity to 0 and hence visible to false. This happens _after_ setRunning(true) + // was called, because the properties were set synchronously but the animation is + // asynchronous. To account for this situation, we only hide ourselves if we're not running. + if (qFuzzyIsNull(data.realValue) && !m_running) setVisible(false); break; case ItemVisibleHasChanged: diff --git a/src/quickcontrols/fusion/impl/qquickfusionbusyindicator_p.h b/src/quickcontrols/fusion/impl/qquickfusionbusyindicator_p.h index 22ff2af788..8581042539 100644 --- a/src/quickcontrols/fusion/impl/qquickfusionbusyindicator_p.h +++ b/src/quickcontrols/fusion/impl/qquickfusionbusyindicator_p.h @@ -44,6 +44,7 @@ protected: void itemChange(ItemChange change, const ItemChangeData &data) override; private: + bool m_running = false; QColor m_color; }; |