@@ -1430,11 +1430,12 @@ FocusScope {
14301430 name: "minimized"; when: appDelegate.minimized
14311431 PropertyChanges {
14321432 target: appDelegate
1433− requestedX: -appDelegate.width / 2
14341433 scale: units.gu(5) / appDelegate.width
14351434 opacity: 0;
14361435 visuallyMinimized: true
14371436 visuallyMaximized: false
1437+ x: -appDelegate.width / 2
1438+ y: root.height / 2
14381439 }
14391440 }
14401441 ]
@@ -1450,15 +1451,6 @@ FocusScope {
14501451 to: "staged,stagedWithSideStage"
14511452 UbuntuNumberAnimation { target: appDelegate; properties: "x,y,requestedX,requestedY,requestedWidth,requestedHeight"; duration: priv.animationDuration}
14521453 },
1453− Transition {
1454− to: "minimized"
1455− enabled: appDelegate.animationsEnabled
1456− PropertyAction { target: appDelegate; property: "visuallyMaximized" }
1457− SequentialAnimation {
1458− UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,opacity,scale,requestedWidth,requestedHeight" }
1459− PropertyAction { target: appDelegate; property: "visuallyMinimized" }
1460− }
1461− },
14621454 Transition {
14631455 to: "spread"
14641456 // DecoratedWindow wants the scaleToPreviewSize set before enabling scaleToPreview
@@ -1507,6 +1499,31 @@ FocusScope {
15071499 PropertyAction { target: appDelegate; property: "visible" }
15081500 }
15091501 },
1502+ Transition {
1503+ from: ",normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"
1504+ to: "minimized"
1505+ SequentialAnimation {
1506+ ScriptAction { script: print("transitioning:", appDelegate.x, appDelegate.y, appDelegate.scale) }
1507+ ScriptAction { script: { fakeRectangle.stop(); } }
1508+ PropertyAction { target: appDelegate; property: "visuallyMaximized" }
1509+ UbuntuNumberAnimation { target: appDelegate; properties: "x,y,scale,opacity"; duration: priv.animationDuration }
1510+ PropertyAction { target: appDelegate; property: "visuallyMinimized" }
1511+ }
1512+ },
1513+ Transition {
1514+ from: "minimized"
1515+ to: ",normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"
1516+ SequentialAnimation {
1517+ ScriptAction { script: print("transitioning:", appDelegate.x, appDelegate.y, appDelegate.scale) }
1518+ PropertyAction { target: appDelegate; property: "visuallyMinimized,z" }
1519+ ParallelAnimation {
1520+ UbuntuNumberAnimation { target: appDelegate; properties: "x"; from: -appDelegate.width / 2; duration: priv.animationDuration }
1521+ UbuntuNumberAnimation { target: appDelegate; properties: "y,opacity"; duration: priv.animationDuration }
1522+ UbuntuNumberAnimation { target: appDelegate; properties: "scale"; from: 0; duration: priv.animationDuration }
1523+ }
1524+ PropertyAction { target: appDelegate; property: "visuallyMaximized" }
1525+ }
1526+ },
15101527 Transition {
15111528 id: windowedTransition
15121529 from: ",normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen,minimized"
@@ -1660,7 +1677,6 @@ FocusScope {
16601677 onClicked: {
16611678 spreadItem.highlightedIndex = index;
16621679 if (distance == 0) {
1663− model.window.activate();
16641680 priv.goneToSpread = false;
16651681 }
16661682 }