git.iko.soy/unity8
on xenial help sign in
don't use animationDuration in DecoratedWindow
365188aMichael Zanetti
qml/Stage/DecoratedWindow.qml+3−4
compare with xenial
unifiedsplit
@@ -81,10 +81,10 @@ FocusScope {
81 QtObject {
81 QtObject {
82 id: d
82 id: d
83 property int requestedDecorationHeight: root.hasDecoration ? decoration.height : 0
83 property int requestedDecorationHeight: root.hasDecoration ? decoration.height : 0
84− Behavior on requestedDecorationHeight { enabled: root.animateDecoration; UbuntuNumberAnimation { duration: priv.animationDuration } }
84+ Behavior on requestedDecorationHeight { enabled: root.animateDecoration; UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration } }
85
85
86 property int visibleDecorationHeight: root.hasDecoration ? root.showDecoration * decoration.height : 0
86 property int visibleDecorationHeight: root.hasDecoration ? root.showDecoration * decoration.height : 0
87− Behavior on visibleDecorationHeight { enabled: root.animateDecoration; UbuntuNumberAnimation { duration: priv.animationDuration } }
87+ Behavior on visibleDecorationHeight { enabled: root.animateDecoration; UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration} }
88 }
88 }
89
89
90 StateGroup {
90 StateGroup {
@@ -145,8 +145,7 @@ FocusScope {
145 title: applicationWindow.title
145 title: applicationWindow.title
146 opacity: root.hasDecoration ? Math.min(1, root.showDecoration) : 0
146 opacity: root.hasDecoration ? Math.min(1, root.showDecoration) : 0
147
147
148− // FIXME: priv.animationDuration reaches out of context... neads cleanup before landing
149− Behavior on opacity { UbuntuNumberAnimation { duration: priv.animationDuration } }
148+ Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration } }
150
149
151 onCloseClicked: root.closeClicked();
150 onCloseClicked: root.closeClicked();
152 onMaximizeClicked: { root.decorationPressed(); root.maximizeClicked(); }
151 onMaximizeClicked: { root.decorationPressed(); root.maximizeClicked(); }