lock screen: show clock and widgets immediately when reducedMotion
This commit is contained in:
parent
8c2f362d04
commit
b8789c67f4
2 changed files with 6 additions and 4 deletions
|
|
@ -10,11 +10,12 @@ Item {
|
||||||
|
|
||||||
readonly property real _fontSize: Math.max(48, screenHeight * 0.28)
|
readonly property real _fontSize: Math.max(48, screenHeight * 0.28)
|
||||||
|
|
||||||
// Appear as wave reaches the clock (left edge), latch once fully revealed
|
// Appear as wave reaches the clock (left edge), latch once fully revealed.
|
||||||
|
// With reducedMotion the wave never runs, so show immediately.
|
||||||
property bool _revealed: false
|
property bool _revealed: false
|
||||||
on_RawProgressChanged: if (_rawProgress >= 1)
|
on_RawProgressChanged: if (_rawProgress >= 1)
|
||||||
_revealed = true
|
_revealed = true
|
||||||
readonly property real _rawProgress: Math.max(0, Math.min(1, wavePhase / 300))
|
readonly property real _rawProgress: S.Theme.reducedMotion ? 1 : Math.max(0, Math.min(1, wavePhase / 300))
|
||||||
readonly property real _progress: (_revealed ? 1 : _rawProgress) * unlockFade
|
readonly property real _progress: (_revealed ? 1 : _rawProgress) * unlockFade
|
||||||
opacity: _progress
|
opacity: _progress
|
||||||
property real _slideX: (1 - _progress) * -80
|
property real _slideX: (1 - _progress) * -80
|
||||||
|
|
|
||||||
|
|
@ -12,11 +12,12 @@ Item {
|
||||||
property real screenWidth: 0
|
property real screenWidth: 0
|
||||||
property real unlockFade: 1
|
property real unlockFade: 1
|
||||||
|
|
||||||
// Fly in when wave exits the right edge, latch once fully revealed
|
// Fly in when wave exits the right edge, latch once fully revealed.
|
||||||
|
// With reducedMotion the wave never runs, so show immediately.
|
||||||
property bool _revealed: false
|
property bool _revealed: false
|
||||||
on_RawProgressChanged: if (_rawProgress >= 1)
|
on_RawProgressChanged: if (_rawProgress >= 1)
|
||||||
_revealed = true
|
_revealed = true
|
||||||
readonly property real _rawProgress: screenWidth > 0 ? Math.max(0, Math.min(1, (wavePhase - screenWidth) / 500)) : 0
|
readonly property real _rawProgress: S.Theme.reducedMotion ? 1 : (screenWidth > 0 ? Math.max(0, Math.min(1, (wavePhase - screenWidth) / 500)) : 0)
|
||||||
readonly property real _progress: (_revealed ? 1 : _rawProgress) * unlockFade
|
readonly property real _progress: (_revealed ? 1 : _rawProgress) * unlockFade
|
||||||
opacity: _progress
|
opacity: _progress
|
||||||
property real _slideX: (1 - _progress) * 80
|
property real _slideX: (1 - _progress) * 80
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue