summaryrefslogtreecommitdiffstats
path: root/basicsuite/mediaplayer/Content.qml
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-11-21 09:56:50 +0100
committerLiang Qi <liang.qi@qt.io>2017-11-21 09:57:00 +0100
commit1820ec590050d37fc7b66cf1f6716f972eb6d684 (patch)
tree52d54ea7ff921005936e122d74eb4d0a57c49bce /basicsuite/mediaplayer/Content.qml
parentc22860511e43ac88a2bad398a0dfcea537501e16 (diff)
parentf9c7da64cea85d44998e62f4e0d3ec217a22f0d2 (diff)
Merge remote-tracking branch 'origin/5.10' into dev
Diffstat (limited to 'basicsuite/mediaplayer/Content.qml')
-rwxr-xr-xbasicsuite/mediaplayer/Content.qml14
1 files changed, 9 insertions, 5 deletions
diff --git a/basicsuite/mediaplayer/Content.qml b/basicsuite/mediaplayer/Content.qml
index aa31f09..00ad381 100755
--- a/basicsuite/mediaplayer/Content.qml
+++ b/basicsuite/mediaplayer/Content.qml
@@ -85,6 +85,9 @@ Rectangle {
Loader {
id: effectLoader
source: effectSource
+ onItemChanged: {
+ updateSource()
+ }
}
onWidthChanged: {
@@ -99,11 +102,7 @@ Rectangle {
onEffectSourceChanged: {
effectLoader.source = effectSource
- effectLoader.item.parent = root
- effectLoader.item.targetWidth = root.width
- effectLoader.item.targetHeight = root.height
updateSource()
- effectLoader.item.source = theSource
}
function init() {
@@ -114,8 +113,13 @@ Rectangle {
function updateSource() {
theSource.sourceItem = videoContent.mediaSource == "" ? introBackground : videoContent
- if (effectLoader.item)
+ if (effectLoader.item) {
+ effectLoader.item.parent = root
+ effectLoader.item.targetWidth = root.width
+ effectLoader.item.targetHeight = root.height
effectLoader.item.anchors.fill = videoContent
+ effectLoader.item.source = theSource
+ }
}
function openVideo(path) {