git.iko.soy/unity8
on xenial help sign in
remove surfaceArea
49f5735Nick Dedekind
qml/Stages/Animations/BaseSurfaceAnimation.qml−1
compare with xenial
unifiedsplit
@@ -38,7 +38,6 @@ import QtQuick 2.0
38Item {
38Item {
39 id: base
39 id: base
40 property Item surface: null
40 property Item surface: null
41− property Item surfaceArea: null
42
41
43 // changes applied when state changes to "in"
42 // changes applied when state changes to "in"
44 property list<QtObject> outChanges
43 property list<QtObject> outChanges
qml/Stages/Animations/DarkenAndFadeInAnimation.qml+3−3
@@ -24,18 +24,18 @@ BaseSurfaceAnimation {
24 outAnimations: [
24 outAnimations: [
25 SequentialAnimation {
25 SequentialAnimation {
26 UbuntuNumberAnimation { target: animation.surface; property: "opacity"; duration: UbuntuAnimation.FastDuration }
26 UbuntuNumberAnimation { target: animation.surface; property: "opacity"; duration: UbuntuAnimation.FastDuration }
27− ColorAnimation { target: animation.surfaceArea; duration: UbuntuAnimation.FastDuration }
27+ ColorAnimation { target: animation.parent; duration: UbuntuAnimation.FastDuration }
28 ScriptAction { script: { if (animation.parent.removing) animation.surface.release(); } }
28 ScriptAction { script: { if (animation.parent.removing) animation.surface.release(); } }
29 }
29 }
30 ]
30 ]
31
31
32 inChanges: [
32 inChanges: [
33− PropertyChanges { target: animation.surfaceArea; color: Qt.rgba(0,0,0,0.7) },
33+ PropertyChanges { target: animation.parent; color: Qt.rgba(0,0,0,0.7) },
34 PropertyChanges { target: animation.surface; opacity: 1.0 }
34 PropertyChanges { target: animation.surface; opacity: 1.0 }
35 ]
35 ]
36 inAnimations: [
36 inAnimations: [
37 SequentialAnimation {
37 SequentialAnimation {
38− ColorAnimation { target: animation.surfaceArea; duration: UbuntuAnimation.FastDuration }
38+ ColorAnimation { target: animation.parent; duration: UbuntuAnimation.FastDuration }
39 UbuntuNumberAnimation { target: animation.surface; property: "opacity"; duration: UbuntuAnimation.FastDuration }
39 UbuntuNumberAnimation { target: animation.surface; property: "opacity"; duration: UbuntuAnimation.FastDuration }
40 }
40 }
41 ]
41 ]
qml/Stages/Animations/SwipeFromBottomAnimation.qml+2−2
@@ -19,7 +19,7 @@ import QtQuick 2.0
19BaseSurfaceAnimation {
19BaseSurfaceAnimation {
20 id: animation
20 id: animation
21
21
22− outChanges: [ AnchorChanges { target: animation.surface; anchors.top: animation.surfaceArea.bottom } ]
22+ outChanges: [ AnchorChanges { target: animation.surface; anchors.top: animation.parent.bottom } ]
23 outAnimations: [
23 outAnimations: [
24 SequentialAnimation {
24 SequentialAnimation {
25 PropertyAction { target: animation.parent; property: "clip"; value: true }
25 PropertyAction { target: animation.parent; property: "clip"; value: true }
@@ -33,7 +33,7 @@ BaseSurfaceAnimation {
33 inChanges: [
33 inChanges: [
34 AnchorChanges {
34 AnchorChanges {
35 target: animation.surface;
35 target: animation.surface;
36− anchors.top: animation.surfaceArea.top
36+ anchors.top: animation.parent.top
37 anchors.right: undefined
37 anchors.right: undefined
38 anchors.bottom: undefined
38 anchors.bottom: undefined
39 anchors.left: undefined
39 anchors.left: undefined
qml/Stages/Animations/SwipeUpAnimation.qml+1−1
@@ -34,7 +34,7 @@ BaseSurfaceAnimation {
34 target: animation.surface;
34 target: animation.surface;
35 anchors.top: undefined
35 anchors.top: undefined
36 anchors.right: undefined
36 anchors.right: undefined
37− anchors.bottom: animation.surfaceArea.top
37+ anchors.bottom: animation.parent.top
38 anchors.left: undefined
38 anchors.left: undefined
39 }
39 }
40 ]
40 ]
qml/Stages/SurfaceContainer.qml+1−1
@@ -75,7 +75,7 @@ Item {
75 }
75 }
76
76
77 function animateIn(component) {
77 function animateIn(component) {
78− var animation = component.createObject(container, { "surface": container.surface, "surfaceArea": container });
78+ var animation = component.createObject(container, { "surface": container.surface });
79 animation.start();
79 animation.start();
80
80
81 var tmp = d.animations;
81 var tmp = d.animations;