From f62d3c7266f7ed36e55f60f4c83e745124b7f02f Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 15 Jun 2021 14:30:34 +0200 Subject: [PATCH] StudioWelcome: Remove effect from splash screen Not supported with Qt 6. Change-Id: Ie12c5b15caaa6b80dcb3dc26fdf43b360b6761a5 Reviewed-by: Tim Jenssen Reviewed-by: Thomas Hartmann --- .../qml/splashscreen/Dof_Effect.qml | 50 ++----------------- .../qml/splashscreen/Welcome_splash.qml | 4 -- 2 files changed, 5 insertions(+), 49 deletions(-) diff --git a/src/plugins/studiowelcome/qml/splashscreen/Dof_Effect.qml b/src/plugins/studiowelcome/qml/splashscreen/Dof_Effect.qml index 010228b88b4..72697e8d18a 100644 --- a/src/plugins/studiowelcome/qml/splashscreen/Dof_Effect.qml +++ b/src/plugins/studiowelcome/qml/splashscreen/Dof_Effect.qml @@ -23,19 +23,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.0 Item { id: root default property alias content: stack.children property alias maskBlurRadius: maskedBlur.radius property alias maskBlurSamples: maskedBlur.samples - property alias gradientStopPosition1: stop1.position - property alias gradientStopPosition2: stop2.position - property alias gradientStopPosition3: stop3.position - property alias gradientStopPosition4: stop4.position - property alias maskRotation: gradient.rotation Row { visible: true @@ -47,47 +41,13 @@ Item { width: stack.width height: stack.height visible: false - - LinearGradient { - id: gradient - height: stack.height * 2 - width: stack.width * 2 - y: -stack.height / 2 - x: -stack.width / 2 - rotation: 0 - gradient: Gradient { - GradientStop { - id: stop1 - position: 0.2 - color: "#ffffffff" - } - GradientStop { - id: stop2 - position: 0.5 - color: "#00ffffff" - } - GradientStop { - id: stop3 - position: 0.8 - color: "#00ffffff" - } - GradientStop { - id: stop4 - position: 1.0 - color: "#ffffffff" - } - } - start: Qt.point(stack.width / 2, 0) - end: Qt.point(stack.width + stack.width / 2, 100) - } } - MaskedBlur { + ShaderEffectSource { id: maskedBlur anchors.fill: stack - source: stack - maskSource: mask - radius: 32 - samples: 16 + sourceItem: stack + property real radius: 0 + property real samples: 0 } } diff --git a/src/plugins/studiowelcome/qml/splashscreen/Welcome_splash.qml b/src/plugins/studiowelcome/qml/splashscreen/Welcome_splash.qml index 416693f5b81..b016997c99a 100644 --- a/src/plugins/studiowelcome/qml/splashscreen/Welcome_splash.qml +++ b/src/plugins/studiowelcome/qml/splashscreen/Welcome_splash.qml @@ -192,10 +192,6 @@ Image { visible: true maskBlurSamples: 64 maskBlurRadius: 32 - gradientStopPosition4: 1.3 - gradientStopPosition3: 0.9 - gradientStopPosition2: 0.6 - gradientStopPosition1: 0 Splash_Image25d { id: animated_artwork