git.iko.soy/unity8
on xenial help sign in
fix some transition glitches
e10b262Michael Zanetti
qml/Stage/Stage.qml+7−9
compare with xenial
unifiedsplit
@@ -146,8 +146,8 @@ AbstractStage {
146
146
147 property bool goneToSpread: false
147 property bool goneToSpread: false
148 property int closingIndex: -1
148 property int closingIndex: -1
149−// property int animationDuration: 4000
149+ property int animationDuration: 4000
150− property int animationDuration: UbuntuAnimation.FastDuration
150+// property int animationDuration: UbuntuAnimation.FastDuration
151
151
152 function updateForegroundMaximizedApp() {
152 function updateForegroundMaximizedApp() {
153 var found = false;
153 var found = false;
@@ -1179,11 +1179,15 @@ AbstractStage {
1179 PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
1179 PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
1180 UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: priv.animationDuration }
1180 UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: priv.animationDuration }
1181 },
1181 },
1182+ Transition {
1183+ from: "normal,maximized,maximizedHorizontally,maximizedVertically,maximizedLeft,maximizedRight"; to: "staged,stagedWithSideStage"
1184+ UbuntuNumberAnimation { target: appDelegate; properties: "x,y,requestedWidth,requestedHeight"; duration: priv.animationDuration}
1185+ },
1182 Transition {
1186 Transition {
1183 from: "maximized,maximizedHorizontally,maximizedVertically,maximizedLeft,maximizedRight,minimized"; to: "normal"
1187 from: "maximized,maximizedHorizontally,maximizedVertically,maximizedLeft,maximizedRight,minimized"; to: "normal"
1184 enabled: appDelegate.animationsEnabled
1188 enabled: appDelegate.animationsEnabled
1185 PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
1189 PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
1186− UbuntuNumberAnimation { target: appDelegate; properties: "x,y,requestedWidth,requestedHeight,scale"; duration: priv.animationDuration }
1190+ UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,requestedWidth,requestedHeight,scale"; duration: priv.animationDuration }
1187 },
1191 },
1188 Transition {
1192 Transition {
1189 from: "normal"; to: "maximized,maximizedHorizontally,maximizedVertically,maximizedLeft,maximizedRight"
1193 from: "normal"; to: "maximized,maximizedHorizontally,maximizedVertically,maximizedLeft,maximizedRight"
@@ -1191,12 +1195,6 @@ AbstractStage {
1191 PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
1195 PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
1192 UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,requestedWidth,requestedHeight"; duration: priv.animationDuration }
1196 UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,requestedWidth,requestedHeight"; duration: priv.animationDuration }
1193 },
1197 },
1194− Transition {
1195− from: "spread"; to: "*"
1196−// UbuntuNumberAnimation { target: appDelegate; properties: "x,y,height"; duration: priv.animationDuration }
1197−// UbuntuNumberAnimation { target: decoratedWindow; properties: "width,height,itemScale,angle"; duration: priv.animationDuration }
1198−// ScriptAction { script: if (appDelegate.focus) appDelegate.playFocusAnimation() }
1199− },
1200 Transition {
1198 Transition {
1201 to: "minimized"
1199 to: "minimized"
1202 enabled: appDelegate.animationsEnabled
1200 enabled: appDelegate.animationsEnabled