on xenial help sign in
Do not occlude windows with an ongoing unmaximize transition (LP: #1666363)

Approved by: Michael Zanetti, Unity8 CI Bot

commit9fbcc99c7af0be1a03a321c1f1077a28f4d76538 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateTue 4 Apr 2017, 22:53 (10 years ago) parentca2a20e7b0b760
1 file changed+9−4
qml/Stage/Stage.qml+9−4
qml/Stage/Stage.qml+9−4
@@ -1380,7 +1380,6 @@ FocusScope {
13801380 requestedX: root.availableDesktopArea.x;
13811381 requestedY: 0;
13821382 visuallyMinimized: false;
1383− visuallyMaximized: true
13841383 requestedWidth: root.availableDesktopArea.width;
13851384 requestedHeight: appContainer.height;
13861385 }
@@ -1403,7 +1402,6 @@ FocusScope {
14031402 PropertyChanges {
14041403 target: appDelegate
14051404 visuallyMinimized: false
1406− visuallyMaximized: false
14071405 }
14081406 PropertyChanges { target: touchControls; enabled: true }
14091407 PropertyChanges { target: resizeArea; enabled: true }
@@ -1596,11 +1594,18 @@ FocusScope {
15961594 to: ",normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"
15971595 enabled: appDelegate.animationsEnabled
15981596 SequentialAnimation {
1597+ ScriptAction { script: {
1598+ if (appDelegate.visuallyMaximized) visuallyMaximized = false; // maximized before -> going to restored
1599+ }
1600+ }
15991601 PropertyAction { target: appDelegate; property: "visuallyMinimized" }
16001602 UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,windowedX,windowedY,opacity,scale,requestedWidth,requestedHeight,windowedWidth,windowedHeight";
16011603 duration: priv.animationDuration }
1602− PropertyAction { target: appDelegate; property: "visuallyMaximized" }
1603− ScriptAction { script: { fakeRectangle.stop(); } }
1604+ ScriptAction { script: {
1605+ fakeRectangle.stop();
1606+ appDelegate.visuallyMaximized = appDelegate.maximized; // reflect the target state
1607+ }
1608+ }
16041609 }
16051610 }
16061611 ]