@@ -574,8 +574,8 @@ AbstractStage {
574 // Do not write to those, they will be set by states
574 // Do not write to those, they will be set by states
575 property real requestedX: windowedX
575 property real requestedX: windowedX
576 property real requestedY: windowedY
576 property real requestedY: windowedY
577− property real requestedWidth
577+ property real requestedWidth: windowedWidth
578− property real requestedHeight
578+ property real requestedHeight: windowedHeight
580 // In those are for windowed mode. Those values basically store the window's properties
580 // In those are for windowed mode. Those values basically store the window's properties
581 // when having a floating window. If you want to move/resize a window in normal mode, this is what you want to write to.
581 // when having a floating window. If you want to move/resize a window in normal mode, this is what you want to write to.
@@ -1134,8 +1134,6 @@ AbstractStage {
1134 target: appDelegate
1134 target: appDelegate
1135 visuallyMinimized: false
1135 visuallyMinimized: false
1136 visuallyMaximized: false
1136 visuallyMaximized: false
1137− requestedWidth: appDelegate.windowedWidth
1138− requestedHeight: appDelegate.windowedHeight
1140 PropertyChanges { target: touchControls; enabled: true }
1138 PropertyChanges { target: touchControls; enabled: true }
1141 PropertyChanges { target: resizeArea; enabled: true }
1139 PropertyChanges { target: resizeArea; enabled: true }
@@ -1162,10 +1160,10 @@ AbstractStage {
1162 extend: "semiMaximized"
1160 extend: "semiMaximized"
1163 PropertyChanges {
1161 PropertyChanges {
1164 target: appDelegate
1162 target: appDelegate
1165− requestedX: root.leftMargin
1163+ windowedX: root.leftMargin
1166− requestedY: PanelState.panelHeight
1164+ windowedY: PanelState.panelHeight
1167− requestedWidth: (appContainer.width - root.leftMargin)/2
1165+ windowedWidth: (appContainer.width - root.leftMargin)/2
1168− requestedHeight: appContainer.height - PanelState.panelHeight
1166+ windowedHeight: appContainer.height - PanelState.panelHeight
@@ -1173,7 +1171,7 @@ AbstractStage {
1173 extend: "maximizedLeft"
1171 extend: "maximizedLeft"
1174 PropertyChanges {
1172 PropertyChanges {
1175 target: appDelegate;
1173 target: appDelegate;
1176− requestedX: (appContainer.width + root.leftMargin)/2
1174+ windowedX: (appContainer.width + root.leftMargin)/2
@@ -1181,10 +1179,10 @@ AbstractStage {
1181 extend: "semiMaximized"
1179 extend: "semiMaximized"
1182 PropertyChanges {
1180 PropertyChanges {
1183 target: appDelegate
1181 target: appDelegate
1184− requestedX: root.leftMargin
1182+ windowedX: root.leftMargin
1185− requestedY: PanelState.panelHeight
1183+ windowedY: PanelState.panelHeight
1186− requestedWidth: (appContainer.width - root.leftMargin)/2
1184+ windowedWidth: (appContainer.width - root.leftMargin)/2
1187− requestedHeight: (appContainer.height - PanelState.panelHeight)/2
1185+ windowedHeight: (appContainer.height - PanelState.panelHeight)/2
@@ -1192,7 +1190,7 @@ AbstractStage {
1192 extend: "maximizedTopLeft"
1190 extend: "maximizedTopLeft"
1193 PropertyChanges {
1191 PropertyChanges {
1194 target: appDelegate
1192 target: appDelegate
1195− requestedX: (appContainer.width + root.leftMargin)/2
1193+ windowedX: (appContainer.width + root.leftMargin)/2
@@ -1200,10 +1198,10 @@ AbstractStage {
1200 extend: "semiMaximized"
1198 extend: "semiMaximized"
1201 PropertyChanges {
1199 PropertyChanges {
1202 target: appDelegate
1200 target: appDelegate
1203− requestedX: root.leftMargin
1201+ windowedX: root.leftMargin
1204− requestedY: (appContainer.height + PanelState.panelHeight)/2
1202+ windowedY: (appContainer.height + PanelState.panelHeight)/2
1205− requestedWidth: (appContainer.width - root.leftMargin)/2
1203+ windowedWidth: (appContainer.width - root.leftMargin)/2
1206− requestedHeight: appContainer.height/2
1204+ windowedHeight: appContainer.height/2
@@ -1211,7 +1209,7 @@ AbstractStage {
1211 extend: "maximizedBottomLeft"
1209 extend: "maximizedBottomLeft"
1212 PropertyChanges {
1210 PropertyChanges {
1213 target: appDelegate
1211 target: appDelegate
1214− requestedX: (appContainer.width + root.leftMargin)/2
1212+ windowedX: (appContainer.width + root.leftMargin)/2
@@ -1255,7 +1253,8 @@ AbstractStage {
1255 to: "normal,restored"
1253 to: "normal,restored"
1256 enabled: appDelegate.animationsEnabled
1254 enabled: appDelegate.animationsEnabled
1257 PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
1255 PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
1258− UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,restoredX,restoredY,requestedWidth,requestedHeight,scale"; duration: priv.animationDuration }
1256+ UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,windowedX,windowedY,requestedWidth,requestedHeight,windowedWidth,windowedHeight,scale";
1257+ duration: priv.animationDuration }
1260 Transition {
1259 Transition {
1261 to: "minimized"
1260 to: "minimized"
@@ -1321,11 +1320,12 @@ AbstractStage {
1323 Transition {
1322 Transition {
1324− to: "maximized,maximizedLeft,maximizedRight,maximizedTop,maximizedBottom,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"
1323+ to: "normal,maximized,maximizedLeft,maximizedRight,maximizedTop,maximizedBottom,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"
1325 enabled: appDelegate.animationsEnabled
1324 enabled: appDelegate.animationsEnabled
1326 SequentialAnimation {
1325 SequentialAnimation {
1327 PropertyAction { target: appDelegate; property: "visuallyMinimized" }
1326 PropertyAction { target: appDelegate; property: "visuallyMinimized" }
1328− UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,opacity,scale,requestedWidth,requestedHeight"; duration: priv.animationDuration }
1327+ UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,windowedX,windowedY,opacity,scale,requestedWidth,requestedHeight,windowedWidth,windowedHeight";
1328+ duration: priv.animationDuration }
1329 PropertyAction { target: appDelegate; property: "visuallyMaximized" }
1329 PropertyAction { target: appDelegate; property: "visuallyMaximized" }
1330 ScriptAction { script: { fakeRectangle.stop(); } }
1330 ScriptAction { script: { fakeRectangle.stop(); } }