on xenial help sign in
Merge lp:~lukas-kde/unity8/fix-restore-positio
commitb60611e31e42efef4bf28d8f25d4bf80c3edd6cb authorAlbert Astals Cid <albert.astals@canonical.com> dateMon 20 Mar 2017, 17:42 (10 years ago) parent593d500ff06167
3 files changed+10−11
qml/Stage/ChildWindowTree.qml−4 qml/Stage/MoveHandler.qml−5 qml/Stage/Stage.qml+10−2
qml/Stage/ChildWindowTree.qml−4
@@ -60,10 +60,6 @@ Item {
6060 property real windowedX: x
6161 property real windowedY: y
6262
63−
64− property real restoredX
65− property real restoredY
66−
6763 state: "restored"
6864 // end of API expected by MoveHandler
6965 ////
qml/Stage/MoveHandler.qml−5
@@ -188,11 +188,6 @@ QtObject {
188188 priv.progress = 0;
189189 priv.resetEdges();
190190 }
191− if ((target.state == "normal" || target.state == "restored") && priv.progress == 0) {
192− // save the x/y to restore to
193− target.restoredX = target.x;
194− target.restoredY = target.y;
195− }
196191 }
197192
198193 function cancelDrag() {
qml/Stage/Stage.qml+10−2
@@ -753,6 +753,14 @@ FocusScope {
753753 normalHeight = appDelegate.height;
754754 }
755755 }
756+ function updateRestoredGeometry() {
757+ if (appDelegate.state == "normal" || appDelegate.state == "restored") {
758+ // save the x/y to restore to
759+ restoredX = appDelegate.x;
760+ restoredY = appDelegate.y;
761+ }
762+ }
763+
756764 Connections {
757765 target: appDelegate
758766 onXChanged: appDelegate.updateNormalGeometry();
@@ -1626,7 +1634,7 @@ FocusScope {
16261634 }
16271635 onMinimizeClicked: { appDelegate.requestMinimize(); }
16281636 onDecorationPressed: { appDelegate.activate(); }
1629− onDecorationReleased: fakeRectangle.commit();
1637+ onDecorationReleased: fakeRectangle.visible ? fakeRectangle.commit() : appDelegate.updateRestoredGeometry()
16301638
16311639 property real angle: 0
16321640 Behavior on angle { enabled: priv.closingIndex >= 0; UbuntuNumberAnimation {} }
@@ -1670,7 +1678,7 @@ FocusScope {
16701678 onFakeMaximizeBottomLeftAnimationRequested: if (!appDelegate.maximizedBottomLeft) fakeRectangle.maximizeBottomLeft(amount, true);
16711679 onFakeMaximizeBottomRightAnimationRequested: if (!appDelegate.maximizedBottomRight) fakeRectangle.maximizeBottomRight(amount, true);
16721680 onStopFakeAnimation: fakeRectangle.stop();
1673− onDragReleased: fakeRectangle.commit();
1681+ onDragReleased: fakeRectangle.visible ? fakeRectangle.commit() : appDelegate.updateRestoredGeometry()
16741682 }
16751683
16761684 WindowedFullscreenPolicy {