@@ -422,12 +422,12 @@ AbstractStage {
422 z: normalZ
422 z: normalZ
423 x: requestedX // may be overridden in some states. Do not directly write to this.
423 x: requestedX // may be overridden in some states. Do not directly write to this.
424 y: requestedY // may be overridden in some states. Do not directly write to this.
424 y: requestedY // may be overridden in some states. Do not directly write to this.
425− property real requestedX: priv.focusedAppDelegate ? priv.focusedAppDelegate.x + units.gu(3) : (normalZ - 1) * units.gu(3)
425+ property real requestedX: 0
426− property real requestedY: priv.focusedAppDelegate ? priv.focusedAppDelegate.y + units.gu(3) : normalZ * units.gu(3)
426+ property real requestedY: 0
427 property int requestedWidth: -1
427 property int requestedWidth: -1
428 property int requestedHeight: -1
428 property int requestedHeight: -1
429− property int windowedX
429+ property int windowedX: priv.focusedAppDelegate ? priv.focusedAppDelegate.x + units.gu(3) : (normalZ - 1) * units.gu(3)
430− property int windowedY
430+ property int windowedY: priv.focusedAppDelegate ? priv.focusedAppDelegate.y + units.gu(3) : normalZ * units.gu(3)
431 property int windowedWidth
431 property int windowedWidth
432 property int windowedHeight
432 property int windowedHeight
@@ -892,7 +892,7 @@ AbstractStage {
893 transitions: [
893 transitions: [
894 Transition {
894 Transition {
895− to: "normal"
895+ from: "staged,stagedWithSideStage"; to: "normal"
896 enabled: appDelegate.animationsEnabled
896 enabled: appDelegate.animationsEnabled
897 PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
897 PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
898 UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: priv.animationDuration }
898 UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: priv.animationDuration }
@@ -948,7 +948,7 @@ AbstractStage {
948 UbuntuNumberAnimation { target: appDelegate; properties: "requestedWidth,requestedHeight"; duration: priv.animationDuration }
948 UbuntuNumberAnimation { target: appDelegate; properties: "requestedWidth,requestedHeight"; duration: priv.animationDuration }
950 Transition {
950 Transition {
951− to: "stagedWithSideStage"
951+ from: "nromal,staged"; to: "stagedWithSideStage"
952 UbuntuNumberAnimation { target: appDelegate; properties: "x,y"; duration: priv.animationDuration }
952 UbuntuNumberAnimation { target: appDelegate; properties: "x,y"; duration: priv.animationDuration }
953 UbuntuNumberAnimation { target: appDelegate; properties: "requestedWidth,requestedHeight"; duration: priv.animationDuration }
953 UbuntuNumberAnimation { target: appDelegate; properties: "requestedWidth,requestedHeight"; duration: priv.animationDuration }