From dc161749fc8af85cdc1fa067da6eec367e085073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 4 Feb 2015 20:22:08 +0100 Subject: ksplash: tweaked the animation to prevent the "magei" effect when waiting for the last stage --- .../share/apps/ksplash/Themes/Default/main.qml | 42 ++++++++++++++-------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/main.qml b/kde4-profiles/common/share/apps/ksplash/Themes/Default/main.qml index db54c8f..0b69bcd 100644 --- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/main.qml +++ b/kde4-profiles/common/share/apps/ksplash/Themes/Default/main.qml @@ -29,27 +29,41 @@ Item { onStageChanged: { if (stage == 1) { - letter1.opacity = 1 - bubble1.opacity = 1 - } - if (stage == 2) { + cauldron.opacity = 0.2 letter2.opacity = 1 - bubble2.opacity = 1 + bubble1.opacity = 0.2 } - if (stage == 3) { + if (stage == 2) { + cauldron.opacity = 0.4 letter3.opacity = 1 - bubble3.opacity = 1 + bubble1.opacity = 0.4 + bubble2.opacity = 0.4 } - if (stage == 4) { + if (stage == 3) { + cauldron.opacity = 0.6 letter4.opacity = 1 - bubble4.opacity = 1 + bubble1.opacity = 0.6 + bubble2.opacity = 0.6 + bubble3.opacity = 0.6 } - if (stage == 5) { + if (stage == 4) { + cauldron.opacity = 0.8 letter5.opacity = 1 + bubble1.opacity = 0.8 + bubble2.opacity = 0.8 + bubble3.opacity = 0.8 + bubble4.opacity = 0.8 + } + if (stage == 5) { + cauldron.opacity = 1 + letter6.opacity = 1 + bubble1.opacity = 1 + bubble2.opacity = 1 + bubble3.opacity = 1 + bubble4.opacity = 1 bubble5.opacity = 1 } if (stage == 6) { - letter6.opacity = 1 bubble6.opacity = 1 } } @@ -78,7 +92,8 @@ Item { source: "images/cauldron.png" - opacity: 1 + opacity: 0 + Behavior on opacity { NumberAnimation { duration: 2000; alwaysRunToEnd: false; easing { type: Easing.InOutQuad } } } } Image { @@ -90,8 +105,7 @@ Item { source: "images/letter1.png" - opacity: 0 - Behavior on opacity { NumberAnimation { duration: 2000; alwaysRunToEnd: false; easing { type: Easing.InOutQuad } } } + opacity: 1 } Image { -- cgit v1.2.1