@@ -1412,11 +1412,12 @@ FocusScope {
1412 name: "minimized"; when: appDelegate.minimized
1412 name: "minimized"; when: appDelegate.minimized
1413 PropertyChanges {
1413 PropertyChanges {
1414 target: appDelegate
1414 target: appDelegate
1415− requestedX: -appDelegate.width / 2
1416 scale: units.gu(5) / appDelegate.width
1415 scale: units.gu(5) / appDelegate.width
1417 opacity: 0;
1416 opacity: 0;
1418 visuallyMinimized: true
1417 visuallyMinimized: true
1419 visuallyMaximized: false
1418 visuallyMaximized: false
1419+ x: -appDelegate.width / 2
@@ -1432,15 +1433,6 @@ FocusScope {
1432 to: "staged,stagedWithSideStage"
1433 to: "staged,stagedWithSideStage"
1433 UbuntuNumberAnimation { target: appDelegate; properties: "x,y,requestedX,requestedY,requestedWidth,requestedHeight"; duration: priv.animationDuration}
1434 UbuntuNumberAnimation { target: appDelegate; properties: "x,y,requestedX,requestedY,requestedWidth,requestedHeight"; duration: priv.animationDuration}
1437− enabled: appDelegate.animationsEnabled
1438− PropertyAction { target: appDelegate; property: "visuallyMaximized" }
1439− SequentialAnimation {
1440− UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,opacity,scale,requestedWidth,requestedHeight" }
1441− PropertyAction { target: appDelegate; property: "visuallyMinimized" }
1444 Transition {
1436 Transition {
1445 to: "spread"
1437 to: "spread"
1446 // DecoratedWindow wants the scaleToPreviewSize set before enabling scaleToPreview
1438 // DecoratedWindow wants the scaleToPreviewSize set before enabling scaleToPreview
@@ -1489,6 +1481,31 @@ FocusScope {
1489 PropertyAction { target: appDelegate; property: "visible" }
1481 PropertyAction { target: appDelegate; property: "visible" }
1485+ from: ",normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"
1487+ SequentialAnimation {
1488+ ScriptAction { script: print("transitioning:", appDelegate.x, appDelegate.y, appDelegate.scale) }
1489+ ScriptAction { script: { fakeRectangle.stop(); } }
1490+ PropertyAction { target: appDelegate; property: "visuallyMaximized" }
1491+ UbuntuNumberAnimation { target: appDelegate; properties: "x,y,scale,opacity"; duration: priv.animationDuration }
1492+ PropertyAction { target: appDelegate; property: "visuallyMinimized" }
1497+ to: ",normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"
1498+ SequentialAnimation {
1499+ ScriptAction { script: print("transitioning:", appDelegate.x, appDelegate.y, appDelegate.scale) }
1500+ PropertyAction { target: appDelegate; property: "visuallyMinimized,z" }
1501+ ParallelAnimation {
1502+ UbuntuNumberAnimation { target: appDelegate; properties: "x"; from: -appDelegate.width / 2; duration: priv.animationDuration }
1503+ UbuntuNumberAnimation { target: appDelegate; properties: "y,opacity"; duration: priv.animationDuration }
1504+ UbuntuNumberAnimation { target: appDelegate; properties: "scale"; from: 0; duration: priv.animationDuration }
1506+ PropertyAction { target: appDelegate; property: "visuallyMaximized" }
1492 Transition {
1509 Transition {
1493 id: windowedTransition
1510 id: windowedTransition
1494 from: ",normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen,minimized"
1511 from: ",normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen,minimized"