diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-08-31 08:19:51 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-08-31 08:20:23 (GMT) |
| commit | e9e0d32bb9c37f42740ffaa8145c30dc5da491d4 (patch) | |
| tree | 2fc5a91377869b8874748e2f161c27558ed15149 /tools | |
| parent | 07095fe95200112ba14bf728148d03f579940c28 (diff) | |
| download | Qt-e9e0d32bb9c37f42740ffaa8145c30dc5da491d4.zip Qt-e9e0d32bb9c37f42740ffaa8145c30dc5da491d4.tar.gz Qt-e9e0d32bb9c37f42740ffaa8145c30dc5da491d4.tar.bz2 | |
Center and clip QML startup animation so it looks correct in fullscreen
QTBUG-12831
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/startup/startup.qml | 88 |
1 files changed, 47 insertions, 41 deletions
diff --git a/tools/qml/startup/startup.qml b/tools/qml/startup/startup.qml index be67598..ddc7217 100644 --- a/tools/qml/startup/startup.qml +++ b/tools/qml/startup/startup.qml @@ -49,14 +49,53 @@ Rectangle { Component.onCompleted: treatsApp.state = "part1" signal animationFinished - Logo { - id: logo - x: 165 - y: 35 - rotation: -15 - scale: 0.6 - opacity: 0 - onAnimationFinished: treatsApp.animationFinished(); + Item { + width: 800 + height: 480 + anchors.centerIn: parent + clip: true + + Logo { + id: logo + x: 165 + y: 35 + rotation: -15 + scale: 0.6 + opacity: 0 + onAnimationFinished: treatsApp.animationFinished(); + } + + Item { + id: quickblur + x: 800//325 + y: 344 + Image { + id: blurText + source: "quick-blur.png" + } + Image { + id: quickregular + x: -1 + y: 0 + opacity: 0 + source: "quick-regular.png" + } + Image { + id: star + x: -1 + y: 0 + opacity: 0 + source: "white-star.png" + smooth: true + NumberAnimation on rotation { + from: 0 + to: 360 + loops: NumberAnimation.Infinite + running: true + duration: 2000 + } + } + } } states: [ @@ -96,39 +135,6 @@ Rectangle { } ] - - Item { - id: quickblur - x: 800//325 - y: 344 - Image { - id: blurText - source: "quick-blur.png" - } - Image { - id: quickregular - x: -1 - y: 0 - opacity: 0 - source: "quick-regular.png" - } - Image { - id: star - x: -1 - y: 0 - opacity: 0 - source: "white-star.png" - smooth: true - NumberAnimation on rotation { - from: 0 - to: 360 - loops: NumberAnimation.Infinite - running: true - duration: 2000 - } - } - } - transitions: [ Transition { ParallelAnimation { |