git.iko.soy/unity8
on xenial help sign in
remove surfaceArea
commit49f5735892f8e4bc9cf840158e4a8b6b79e1b7e7 authorNick Dedekind <nicholas.dedekind@gmail.com> dateWed 23 Jul 2014, 13:23 (12 years ago) parentd2cb49d
5 files changed+7−8
compare with xenial
unifiedsplit
qml/Stages/Animations/BaseSurfaceAnimation.qml−1 qml/Stages/Animations/DarkenAndFadeInAnimation.qml+3−3 qml/Stages/Animations/SwipeFromBottomAnimation.qml+2−2 qml/Stages/Animations/SwipeUpAnimation.qml+1−1 qml/Stages/SurfaceContainer.qml+1−1
qml/Stages/Animations/BaseSurfaceAnimation.qml−1
@@ -38,7 +38,6 @@ import QtQuick 2.0
3838Item {
3939 id: base
4040 property Item surface: null
41− property Item surfaceArea: null
4241
4342 // changes applied when state changes to "in"
4443 property list<QtObject> outChanges
qml/Stages/Animations/DarkenAndFadeInAnimation.qml+3−3
@@ -24,18 +24,18 @@ BaseSurfaceAnimation {
2424 outAnimations: [
2525 SequentialAnimation {
2626 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 }
2828 ScriptAction { script: { if (animation.parent.removing) animation.surface.release(); } }
2929 }
3030 ]
3131
3232 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) },
3434 PropertyChanges { target: animation.surface; opacity: 1.0 }
3535 ]
3636 inAnimations: [
3737 SequentialAnimation {
38− ColorAnimation { target: animation.surfaceArea; duration: UbuntuAnimation.FastDuration }
38+ ColorAnimation { target: animation.parent; duration: UbuntuAnimation.FastDuration }
3939 UbuntuNumberAnimation { target: animation.surface; property: "opacity"; duration: UbuntuAnimation.FastDuration }
4040 }
4141 ]
qml/Stages/Animations/SwipeFromBottomAnimation.qml+2−2
@@ -19,7 +19,7 @@ import QtQuick 2.0
1919BaseSurfaceAnimation {
2020 id: animation
2121
22− outChanges: [ AnchorChanges { target: animation.surface; anchors.top: animation.surfaceArea.bottom } ]
22+ outChanges: [ AnchorChanges { target: animation.surface; anchors.top: animation.parent.bottom } ]
2323 outAnimations: [
2424 SequentialAnimation {
2525 PropertyAction { target: animation.parent; property: "clip"; value: true }
@@ -33,7 +33,7 @@ BaseSurfaceAnimation {
3333 inChanges: [
3434 AnchorChanges {
3535 target: animation.surface;
36− anchors.top: animation.surfaceArea.top
36+ anchors.top: animation.parent.top
3737 anchors.right: undefined
3838 anchors.bottom: undefined
3939 anchors.left: undefined
qml/Stages/Animations/SwipeUpAnimation.qml+1−1
@@ -34,7 +34,7 @@ BaseSurfaceAnimation {
3434 target: animation.surface;
3535 anchors.top: undefined
3636 anchors.right: undefined
37− anchors.bottom: animation.surfaceArea.top
37+ anchors.bottom: animation.parent.top
3838 anchors.left: undefined
3939 }
4040 ]
qml/Stages/SurfaceContainer.qml+1−1
@@ -75,7 +75,7 @@ Item {
7575 }
7676
7777 function animateIn(component) {
78− var animation = component.createObject(container, { "surface": container.surface, "surfaceArea": container });
78+ var animation = component.createObject(container, { "surface": container.surface });
7979 animation.start();
8080
8181 var tmp = d.animations;