@@ -574,8 +574,8 @@ AbstractStage {
574574 // Do not write to those, they will be set by states
575575 property real requestedX: windowedX
576576 property real requestedY: windowedY
577− property real requestedWidth
578− property real requestedHeight
577+ property real requestedWidth: windowedWidth
578+ property real requestedHeight: windowedHeight
579579
580580 // In those are for windowed mode. Those values basically store the window's properties
581581 // 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 {
11341134 target: appDelegate
11351135 visuallyMinimized: false
11361136 visuallyMaximized: false
1137− requestedWidth: appDelegate.windowedWidth
1138− requestedHeight: appDelegate.windowedHeight
11391137 }
11401138 PropertyChanges { target: touchControls; enabled: true }
11411139 PropertyChanges { target: resizeArea; enabled: true }
@@ -1162,10 +1160,10 @@ AbstractStage {
11621160 extend: "semiMaximized"
11631161 PropertyChanges {
11641162 target: appDelegate
1165− requestedX: root.leftMargin
1166− requestedY: PanelState.panelHeight
1167− requestedWidth: (appContainer.width - root.leftMargin)/2
1168− requestedHeight: appContainer.height - PanelState.panelHeight
1163+ windowedX: root.leftMargin
1164+ windowedY: PanelState.panelHeight
1165+ windowedWidth: (appContainer.width - root.leftMargin)/2
1166+ windowedHeight: appContainer.height - PanelState.panelHeight
11691167 }
11701168 },
11711169 State {
@@ -1173,7 +1171,7 @@ AbstractStage {
11731171 extend: "maximizedLeft"
11741172 PropertyChanges {
11751173 target: appDelegate;
1176− requestedX: (appContainer.width + root.leftMargin)/2
1174+ windowedX: (appContainer.width + root.leftMargin)/2
11771175 }
11781176 },
11791177 State {
@@ -1181,10 +1179,10 @@ AbstractStage {
11811179 extend: "semiMaximized"
11821180 PropertyChanges {
11831181 target: appDelegate
1184− requestedX: root.leftMargin
1185− requestedY: PanelState.panelHeight
1186− requestedWidth: (appContainer.width - root.leftMargin)/2
1187− requestedHeight: (appContainer.height - PanelState.panelHeight)/2
1182+ windowedX: root.leftMargin
1183+ windowedY: PanelState.panelHeight
1184+ windowedWidth: (appContainer.width - root.leftMargin)/2
1185+ windowedHeight: (appContainer.height - PanelState.panelHeight)/2
11881186 }
11891187 },
11901188 State {
@@ -1192,7 +1190,7 @@ AbstractStage {
11921190 extend: "maximizedTopLeft"
11931191 PropertyChanges {
11941192 target: appDelegate
1195− requestedX: (appContainer.width + root.leftMargin)/2
1193+ windowedX: (appContainer.width + root.leftMargin)/2
11961194 }
11971195 },
11981196 State {
@@ -1200,10 +1198,10 @@ AbstractStage {
12001198 extend: "semiMaximized"
12011199 PropertyChanges {
12021200 target: appDelegate
1203− requestedX: root.leftMargin
1204− requestedY: (appContainer.height + PanelState.panelHeight)/2
1205− requestedWidth: (appContainer.width - root.leftMargin)/2
1206− requestedHeight: appContainer.height/2
1201+ windowedX: root.leftMargin
1202+ windowedY: (appContainer.height + PanelState.panelHeight)/2
1203+ windowedWidth: (appContainer.width - root.leftMargin)/2
1204+ windowedHeight: appContainer.height/2
12071205 }
12081206 },
12091207 State {
@@ -1211,7 +1209,7 @@ AbstractStage {
12111209 extend: "maximizedBottomLeft"
12121210 PropertyChanges {
12131211 target: appDelegate
1214− requestedX: (appContainer.width + root.leftMargin)/2
1212+ windowedX: (appContainer.width + root.leftMargin)/2
12151213 }
12161214 },
12171215 State {
@@ -1255,7 +1253,8 @@ AbstractStage {
12551253 to: "normal,restored"
12561254 enabled: appDelegate.animationsEnabled
12571255 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 }
12591258 },
12601259 Transition {
12611260 to: "minimized"
@@ -1321,11 +1320,12 @@ AbstractStage {
13211320 }
13221321 },
13231322 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"
13251324 enabled: appDelegate.animationsEnabled
13261325 SequentialAnimation {
13271326 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 }
13291329 PropertyAction { target: appDelegate; property: "visuallyMaximized" }
13301330 ScriptAction { script: { fakeRectangle.stop(); } }
13311331 }