e0e06e8 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

do not occlude windows with an ongoing unmaximize transition

e0e06e8Lukáš Tinkl10 years ago

qml/Stage/Stage.qml+5−1

compare with xenial

unifiedsplit

@@ -347,6 +347,8 @@ FocusScope {

347 }

348

349 readonly property real virtualKeyboardHeight: root.inputMethodRect.height

350+

351+ property bool anyWindowAnimating: false

350 }

352 }

351

353

352 Component.onCompleted: priv.updateMainAndSideStageIndexes();

354 Component.onCompleted: priv.updateMainAndSideStageIndexes();

@@ -1022,6 +1024,7 @@ FocusScope {

1022 )

1024 )

1023 || appDelegate.fullscreen

1025 || appDelegate.fullscreen

1024 || focusAnimation.running || rightEdgeFocusAnimation.running || hidingAnimation.running

1026 || focusAnimation.running || rightEdgeFocusAnimation.running || hidingAnimation.running

1027+ || priv.anyWindowAnimating // bug #1666363

1025

1028

1026 function close() {

1029 function close() {

1027 model.window.close();

1030 model.window.close();

@@ -1566,11 +1569,12 @@ FocusScope {

1566 to: ",normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"

1569 to: ",normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"

1567 enabled: appDelegate.animationsEnabled

1570 enabled: appDelegate.animationsEnabled

1568 SequentialAnimation {

1571 SequentialAnimation {

1572+ ScriptAction { script: { priv.anyWindowAnimating = true; } }

1569 PropertyAction { target: appDelegate; property: "visuallyMinimized" }

1573 PropertyAction { target: appDelegate; property: "visuallyMinimized" }

1570 UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,windowedX,windowedY,opacity,scale,requestedWidth,requestedHeight,windowedWidth,windowedHeight";

1574 UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,windowedX,windowedY,opacity,scale,requestedWidth,requestedHeight,windowedWidth,windowedHeight";

1571 duration: priv.animationDuration }

1575 duration: priv.animationDuration }

1572 PropertyAction { target: appDelegate; property: "visuallyMaximized" }

1576 PropertyAction { target: appDelegate; property: "visuallyMaximized" }

1573− ScriptAction { script: { fakeRectangle.stop(); } }

1577+ ScriptAction { script: { fakeRectangle.stop(); priv.anyWindowAnimating = false; } }

1574 }

1578 }

1575 }

1579 }

1576 ]

1580 ]