Unity 8

Merge lp:~lukas-kde/unity8/windowOpenCloseAnimations into lp:unity8

windowOpenCloseAnimations
Merge into trunk

Proposed by Lukáš Tinkl on 2016-02-02

Status:

Superseded

Proposed branch:

lp:~lukas-kde/unity8/windowOpenCloseAnimations

Merge into:

lp:unity8

Prerequisite:

lp:~mzanetti/unity8/launcher-sizing

Diff against target:

558 lines (+209/-75)

10 files modified

plugins/Unity/Indicators/indicatorsmanager.cpp (+3/-5)
qml/Panel/Indicators/MenuItemFactory.qml (+46/-0)
qml/Stages/ApplicationWindow.qml (+5/-8)
qml/Stages/DecoratedWindow.qml (+3/-6)
qml/Stages/DesktopStage.qml (+135/-22)
qml/Stages/SurfaceContainer.qml (+7/-26)
qml/Stages/WindowResizeArea.qml (+5/-5)
tests/qmltests/Stages/tst_DesktopStage.qml (+3/-3)
tests/qmltests/Stages/tst_WindowResizeArea.qml (+1/-0)
tests/qmltests/tst_Shell.qml (+1/-0)

To merge this branch:

bzr merge lp:~lukas-kde/unity8/windowOpenCloseAnimations

Medium

In Progress

Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2016-02-02	Needs Fixing on 2016-02-11
Daniel d'Andrada (community)			Approve on 2016-02-11
PS Jenkins bot	continuous-integration	2016-02-02	Needs Fixing on 2016-02-11
Nick Dedekind		2016-02-02	Pending
Michael Terry		2016-02-02	Pending
Review via email: mp+284775@code.launchpad.net

This proposal supersedes a proposal from 2016-01-08.

This proposal has been superseded by a proposal from 2016-02-17.

Commit Message

Provide animations for windows opening/closing

Description of the Change

Provide animations for windows opening/closing, as described by UX in the original bugreport.

* Are there any related MPs required for this MP to build/function as expected? Please list.

Yes, lp:~mzanetti/unity8/launcher-sizing

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

* Did you make sure that your branch does not contain spurious tags?

Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Yes

* If you changed the UI, has there been a design review?

Yes

PS Jenkins bot (ps-jenkins) wrote on 2016-01-11: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7041/rebuild

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2016-01-12: Posted in a previous version of this proposal

- The app closing animation seems to "stick" on the last frame. Or not smoothly go down to zero opacity. Or something. It didn't look right on my mako.

- closeApplication() takes two arguments, normally only using the first one. It uses the appId if the first argument is not given, which is an odd construction. Maybe just drop the second argument completely, as it's never used?

Otherwise already looks nice. :)

Lukáš Tinkl (lukas-kde) wrote on 2016-01-13: Posted in a previous version of this proposal

> - The app closing animation seems to "stick" on the last frame. Or not
> smoothly go down to zero opacity. Or something. It didn't look right on my
> mako.

Agree, using the standard UbuntuNumberAnimation feels much smoother, at least here

> - closeApplication() takes two arguments, normally only using the first one.
> It uses the appId if the first argument is not given, which is an odd
> construction. Maybe just drop the second argument completely, as it's never
> used?

Fixed

> Otherwise already looks nice. :)

PS Jenkins bot (ps-jenkins) wrote on 2016-01-13: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7048/rebuild

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2016-01-13: Posted in a previous version of this proposal

> Agree, using the standard UbuntuNumberAnimation feels much smoother, at least here

I'm still seeing a bit of a pause at the end of the animation on my mako.

Lukáš Tinkl (lukas-kde) wrote on 2016-01-13: Posted in a previous version of this proposal

> > Agree, using the standard UbuntuNumberAnimation feels much smoother, at
> least here
>
> I'm still seeing a bit of a pause at the end of the animation on my mako.

I guess it's the reverse easing (UbuntuAnimation.StandardEasingReverse), if I try with StandardEasing, it goes away.

Michael Terry (mterry) wrote on 2016-01-13: Posted in a previous version of this proposal

Yeah agreed, StandardEasing looks good to me. Is StandardEasingReverse specifically requested by Design?

Lukáš Tinkl (lukas-kde) wrote on 2016-01-13: Posted in a previous version of this proposal

Yes, as per the attached bug report

Michael Terry (mterry) wrote on 2016-01-13: Posted in a previous version of this proposal

Hrm. OK, but I ran Vesa's test code. And it didn't seem to pause at the end of the animation for me.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-13: Posted in a previous version of this proposal

PASSED: Continuous integration, rev:2114
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/40/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/40/rebuild

review: Approve (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2016-01-15: Posted in a previous version of this proposal

Confirming the close animation stuttering on flo. Could not see it on my laptop.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-15: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2115
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/94/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/94/rebuild

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2016-01-15: Posted in a previous version of this proposal

Please test again, not it feels much smoother on both phone and desktop.

PS Jenkins bot (ps-jenkins) wrote on 2016-01-15: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7081/rebuild

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2016-01-15: Posted in a previous version of this proposal

the new animation does behave better on my flo, but it's still not 100% perfect. Paying close attention one can still see the last frames sticking around longer than they should. I don't think it's a problem of this branch, rather some sync stuff happening in Unity.Application when cleaning the app out of the memory. The new animation makes it less obvious.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-15: Posted in a previous version of this proposal

PASSED: Continuous integration, rev:2115
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/94/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/94/rebuild

review: Approve (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-15: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2115
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/94/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/94/rebuild

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2016-01-15: Posted in a previous version of this proposal

But Michael, wouldn't the Unity.Application work only start happening once opacity is already animated down to zero?

PS Jenkins bot (ps-jenkins) wrote on 2016-01-15: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7084/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-15: Posted in a previous version of this proposal

PASSED: Continuous integration, rev:2117
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/101/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/101/rebuild

review: Approve (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-15: Posted in a previous version of this proposal

PASSED: Continuous integration, rev:2117
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/103/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/103/rebuild

review: Approve (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-15: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2117
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/103/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/103/rebuild

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2016-01-18: Posted in a previous version of this proposal

Animation is now smooth on devices, using a small hack to pause the animation at the end before actually closing the application.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-18: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2118
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/108/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/108/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-18: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2118
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/108/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/108/rebuild

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2016-01-18: Posted in a previous version of this proposal

Looks good to me. The delay after the animation is a gross hack, but not the worst thing. I sat with Lukas and couldn't figure out why it would be needed. But it seems to be for now.

So approved from my end. Animation is smooth with the delay.

Tested it manually.
CI bot is crazy right now, let's wait for it to fix itself before top-approving.
No tags.

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-18: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2118
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/108/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/108/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-01-18: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7089/rebuild

review: Needs Fixing (continuous-integration)

Nick Dedekind (nick-dedekind) wrote on 2016-01-18: Posted in a previous version of this proposal

I believe this is what is causing the window to not be visible when opening a maximised app.

review: Needs Fixing

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-18: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2118
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/126/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/126/rebuild

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2016-01-19: Posted in a previous version of this proposal

Starting maximized apps should be fixed now

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-19: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2120
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/132/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/132/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-01-19: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7098/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-19: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2121
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/133/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/133/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-01-19: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7099/rebuild

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2016-01-19: Posted in a previous version of this proposal

LGTM now, maximized works.

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-02:

FAILED: Continuous integration, rev:2122
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/254/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/254/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-02:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7197/rebuild

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2016-02-10:

make tryShell
- select desktop size
- unlock screen
- select windowed mode

window gets broken

review: Needs Fixing

lp:~lukas-kde/unity8/windowOpenCloseAnimations updated on 2016-02-10

2123. By Nick Dedekind on 2016-02-10: fix disappearing windows

Lukáš Tinkl (lukas-kde) wrote on 2016-02-10:

OK, fixed the behavior, just not sure where to take the default size from, I have this atm:

PropertyChanges {
  target: decoratedWindow
  requestedWidth: resizeArea.defaultWidth
  requestedHeight: resizeArea.defaultHeight
}

Daniel d'Andrada (dandrader) wrote on 2016-02-10:

Could you please re-merge your prerequisite? You seem to have an outdated version of it....

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-10:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/308/rebuild

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/windowOpenCloseAnimations updated on 2016-02-10

2124. By Lukáš Tinkl on 2016-02-10: merge prereq

Lukáš Tinkl (lukas-kde) wrote on 2016-02-10:

> Could you please re-merge your prerequisite? You seem to have an outdated
> version of it....

Rebased

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-10:

FAILED: Continuous integration, rev:2124
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/310/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/431/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/454
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/472
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/472
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/468/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/468/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/468/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/468/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/468/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/468/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/310/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-10:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7248/rebuild

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/windowOpenCloseAnimations updated on 2016-02-10

2125. By Lukáš Tinkl on 2016-02-10

reevaluate the screen size by making it a binding

fixes tiny windows when switching stages

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-10:

FAILED: Continuous integration, rev:2125
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/313/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/434/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/457
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/475
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/475
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/471/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/471/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/471/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/471/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/471/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/471/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/313/rebuild

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/windowOpenCloseAnimations updated on 2016-02-10

2126. By Lukáš Tinkl on 2016-02-10: drive just the appDelegate in states and transitions
2127. By Lukáš Tinkl on 2016-02-10: restore max states

PS Jenkins bot (ps-jenkins) wrote on 2016-02-10:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7253/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-10:

FAILED: Continuous integration, rev:2126
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/317/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/438/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/461
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/479
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/479
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/475/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/475/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/475/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/475/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/475/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/475/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/317/rebuild

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/windowOpenCloseAnimations updated on 2016-02-10

2128. By Lukáš Tinkl on 2016-02-10: partial revert, turn the x/y coords into a binding as well
(they depend on screenWidth/Height too)

Lukáš Tinkl (lukas-kde) wrote on 2016-02-10:

Done, no more regressions spotted

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-10:

FAILED: Continuous integration, rev:2127
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/318/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/439/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/462
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/480
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/480
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/476/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/476/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/476/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/476/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/476/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/476/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/318/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-10:

FAILED: Continuous integration, rev:2128
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/320/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/441/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/464
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/482
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/482
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/478/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/478/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/478/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/478/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/478/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/478/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/320/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-10:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7257/rebuild

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/windowOpenCloseAnimations updated on 2016-02-10

2129. By Lukáš Tinkl on 2016-02-10: simplify code, fix restoring maximized windows

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-10:

FAILED: Continuous integration, rev:2129
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/321/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/442/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/465
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/483
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/483
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/479/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/479/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/479/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/479/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/479/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/479/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/321/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-10:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7259/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7261/rebuild

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/windowOpenCloseAnimations updated on 2016-02-11

2130. By Lukáš Tinkl on 2016-02-11: make close() a method of the delegate

Daniel d'Andrada (dandrader) wrote on 2016-02-11:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass? If not, please explain why.
Will never pass due to unity-api dependency from the prerequisites

* Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-11:

FAILED: Continuous integration, rev:2130
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/324/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/445/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/468
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/486
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/486
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/482/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/482/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/482/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/482/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/482/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/482/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/324/rebuild

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/windowOpenCloseAnimations updated on 2016-04-14

2131. By Lukáš Tinkl on 2016-02-17

merge prereq, fix conflicts

2132. By Lukáš Tinkl on 2016-02-17

merge lp:~unity-team/unity8/launcher-sizing

2133. By Lukáš Tinkl on 2016-02-19

merge prereq

2134. By Lukáš Tinkl on 2016-02-24

merge trunk

2135. By Lukáš Tinkl on 2016-02-24

handle the close case coming from launcher

2136. By Lukáš Tinkl on 2016-02-24

fix the launcher ApplicationManager mock

2137. By Lukáš Tinkl on 2016-02-26

restart app if focusing doesn't work

happens with dash sometimes

2138. By Lukáš Tinkl on 2016-02-26

make the close animation testable using the App checkbox

2139. By Lukáš Tinkl on 2016-02-27

fix fullscreen apps being offset by the left margin

2140. By Lukáš Tinkl on 2016-02-27

disallow resizing windows up past the Panel

2141. By Lukáš Tinkl on 2016-02-28

fix closing animation for minimized apps

2142. By Lukáš Tinkl on 2016-02-29

fullscreen apps fix

2143. By Lukáš Tinkl on 2016-02-29

fix for fullscreen windows height

2144. By Lukáš Tinkl on 2016-03-06

merge lp:~mzanetti/unity8/launcher-sizing

2145. By Lukáš Tinkl on 2016-03-06

revert keymap (unrelated) changes

2146. By Lukáš Tinkl on 2016-03-06

depend on -15 appl framework

2147. By Lukáš Tinkl on 2016-03-06

implement maximizeHorizontally/Vertically

2148. By Lukáš Tinkl on 2016-03-07

requestStop() here

2149. By Lukáš Tinkl on 2016-03-07

save/restore the correct state in all cases

implement (easy now) maximize horizontal/vertical using it

2150. By Lukáš Tinkl on 2016-03-12

merge trunk

2151. By Lukáš Tinkl on 2016-03-21

merge trunk

2152. By Lukáš Tinkl on 2016-03-22

merge trunk

2153. By Lukáš Tinkl on 2016-03-24

merge trunk, resolve conflicts

2154. By Lukáš Tinkl on 2016-04-07

merge trunk

2155. By Lukáš Tinkl on 2016-04-14

merge trunk

Unmerged revisions

2155. By Lukáš Tinkl on 2016-04-14

merge trunk

2154. By Lukáš Tinkl on 2016-04-07

merge trunk

2153. By Lukáš Tinkl on 2016-03-24

merge trunk, resolve conflicts

2152. By Lukáš Tinkl on 2016-03-22

merge trunk

2151. By Lukáš Tinkl on 2016-03-21

merge trunk

2150. By Lukáš Tinkl on 2016-03-12

merge trunk

2149. By Lukáš Tinkl on 2016-03-07

save/restore the correct state in all cases

implement (easy now) maximize horizontal/vertical using it

2148. By Lukáš Tinkl on 2016-03-07

requestStop() here

2147. By Lukáš Tinkl on 2016-03-06

implement maximizeHorizontally/Vertically

2146. By Lukáš Tinkl on 2016-03-06

depend on -15 appl framework

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Lukáš Tinkl

Mohammad Rakibul Hasan

Unity Team

 === modified file 'plugins/Unity/Indicators/indicatorsmanager.cpp'
 --- plugins/Unity/Indicators/indicatorsmanager.cpp	2015-12-02 12:02:50 +0000
 +++ plugins/Unity/Indicators/indicatorsmanager.cpp	2016-02-17 21:52:10 +0000
@@ -116,10 +116,6 @@
      QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);
      const QString name = indicator_settings.value(QStringLiteral("Indicator Service/Name")).toString();
--    if (m_platform.isPC() && name == "indicator-keyboard") {
--        return; // convergence: skip this indicator until it works in Mir
--    }
--
      auto iter = m_indicatorsData.constFind(name);
      if (iter != m_indicatorsData.constEnd())
+     {
@@ -289,10 +285,12 @@
      // 1) enable session indicator conditionally, typically when running in a multisession/multiuser environment
      // 2) on a PC, switch the battery/power indicator to desktop mode,
      //    can't control brightness for now and phone-on-desktop broken (FIXME)
++    // 3) enable the keyboard switcher on u8 (it has no phone profile yet, FIXME)
      //
      // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
      if ((new_indicator->identifier() == QStringLiteral("indicator-session") && m_platform.isMultiSession())
--            || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
++            || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())
++            || (new_indicator->identifier() == QStringLiteral("indicator-keyboard"))) {
          new_indicator->setProfile("desktop");
      } else {
          new_indicator->setProfile(m_profile);
 === modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
 --- qml/Panel/Indicators/MenuItemFactory.qml	2016-01-11 17:36:56 +0000
 +++ qml/Panel/Indicators/MenuItemFactory.qml	2016-02-17 21:52:10 +0000
@@ -300,6 +300,49 @@
+     }
      Component {
++        id: keymapMenu;
++
++        Menus.CheckableMenu {
++            id: keymapItem
++            objectName: "keymapMenu"
++            property QtObject menuData: null
++            property int menuIndex: -1
++            property bool serverChecked: menuData && menuData.isToggled || false
++
++            text: menuData && menuData.label || ""
++            enabled: menuData && menuData.sensitive && !serverChecked || false
++            checked: serverChecked
++            highlightWhenPressed: false
++
++            ServerPropertySynchroniser {
++                objectName: "sync"
++                syncTimeout: Utils.Constants.indicatorValueTimeout
++
++                serverTarget: keymapItem
++                serverProperty: "serverChecked"
++                userTarget: keymapItem
++                userProperty: "checked"
++
++                onSyncTriggered: {
++                    var keymapIndex = keymapItem.menuIndex;
++                    keymapActionGroup.currentAction.updateState(keymapIndex);
++                }
++            }
++
++            QDBusActionGroup {
++                id: keymapActionGroup
++                busType: DBus.SessionBus
++                busName: "com.canonical.indicator.keyboard"
++                objectPath: "/com/canonical/indicator/keyboard"
++
++                property variant currentAction: action("current")
++
++                Component.onCompleted: keymapActionGroup.start()
++            }
++        }
++    }
++
++    Component {
          id: checkableMenu;
          Menus.CheckableMenu {
@@ -994,6 +1037,9 @@
              console.debug("Don't know how to make " + modelData.type + " for " + context);
+         }
          if (modelData.isCheck || modelData.isRadio) {
++            if (context === "indicator-keyboard" ) {
++                return keymapMenu;
++            }
              return checkableMenu;
+         }
          if (modelData.isSeparator) {
 === modified file 'qml/Stages/ApplicationWindow.qml'
 --- qml/Stages/ApplicationWindow.qml	2016-02-17 21:52:09 +0000
 +++ qml/Stages/ApplicationWindow.qml	2016-02-17 21:52:10 +0000
@@ -29,6 +29,7 @@
      property bool orientationChangesEnabled: d.supportsSurfaceResize ? d.surfaceOldEnoughToBeResized : true
      readonly property string title: sessionContainer.surface && sessionContainer.surface.name !== "" ?
                                          sessionContainer.surface.name : d.name
++    readonly property string currentKeymap: sessionContainer.surfaceContainer ? sessionContainer.surfaceContainer.currentKeymap : "us"
      // to be set from outside
      property QtObject application
@@ -37,6 +38,10 @@
      property int requestedWidth: -1
      property int requestedHeight: -1
++    function switchToKeymap(index) {
++        sessionContainer.surfaceContainer.switchToKeymap(index);
++    }
++
      readonly property int minimumWidth: sessionContainer.surface ? sessionContainer.surface.minimumWidth : 0
      readonly property int minimumHeight: sessionContainer.surface ? sessionContainer.surface.minimumHeight : 0
      readonly property int maximumWidth: sessionContainer.surface ? sessionContainer.surface.maximumWidth : 0
@@ -44,14 +49,6 @@
      readonly property int widthIncrement: sessionContainer.surface ? sessionContainer.surface.widthIncrement : 0
      readonly property int heightIncrement: sessionContainer.surface ? sessionContainer.surface.heightIncrement : 0
--    function nextKeymap() {
--        sessionContainer.surfaceContainer.nextKeymap();
--    }
--
--    function previousKeymap() {
--        sessionContainer.surfaceContainer.previousKeymap();
--    }
--
      QtObject {
          id: d
 === modified file 'qml/Stages/DecoratedWindow.qml'
 --- qml/Stages/DecoratedWindow.qml	2016-02-17 21:52:09 +0000
 +++ qml/Stages/DecoratedWindow.qml	2016-02-17 21:52:10 +0000
@@ -31,6 +31,7 @@
      property alias active: decoration.active
      property alias title: decoration.title
      property alias fullscreen: applicationWindow.fullscreen
++    readonly property alias currentKeymap: applicationWindow.currentKeymap
      readonly property bool decorationShown: !fullscreen
      property bool highlightShown: false
@@ -51,12 +52,8 @@
      signal minimize()
      signal decorationPressed()
--    function nextKeymap() {
--        applicationWindow.nextKeymap();
--    }
--
--    function previousKeymap() {
--        applicationWindow.previousKeymap();
++    function switchToKeymap(index) {
++        applicationWindow.switchToKeymap(index);
+     }
      Rectangle {
 === modified file 'qml/Stages/DesktopStage.qml'
 --- qml/Stages/DesktopStage.qml	2016-02-17 21:52:09 +0000
 +++ qml/Stages/DesktopStage.qml	2016-02-17 21:52:10 +0000
@@ -22,6 +22,7 @@
  import Utils 0.1
  import Ubuntu.Gestures 0.1
  import GlobalShortcut 1.0
++import QMenuModel 0.1 as QMenuModel
  import AccountsService 0.1
  AbstractStage {
@@ -61,9 +62,8 @@
+         }
          onFocusRequested: {
--            var appIndex = priv.indexOf(appId);
--            var appDelegate = appRepeater.itemAt(appIndex);
--            appDelegate.restore();
++            var delegate = priv.appDelegate(appId);
++            delegate.restore();
              if (spread.state == "altTab") {
                  spread.cancel();
@@ -74,7 +74,7 @@
      GlobalShortcut {
          id: closeWindowShortcut
          shortcut: Qt.AltModifier|Qt.Key_F4
--        onTriggered: ApplicationManager.stopApplication(priv.focusedAppId)
++        onTriggered: priv.focusedAppDelegate.close()
          active: priv.focusedAppId !== ""
+     }
@@ -121,14 +121,12 @@
      GlobalShortcut {
          shortcut: Qt.MetaModifier|Qt.Key_Space
--        onTriggered: priv.focusedAppDelegate.nextKeymap()
--        active: priv.focusedAppDelegate !== null
++        onTriggered: priv.nextKeymap()
+     }
      GlobalShortcut {
          shortcut: Qt.MetaModifier|Qt.ShiftModifier|Qt.Key_Space
--        onTriggered: priv.focusedAppDelegate.previousKeymap()
--        active: priv.focusedAppDelegate !== null
++        onTriggered: priv.previousKeymap()
+     }
      QtObject {
@@ -188,13 +186,72 @@
+                 }
+             }
+         }
++
++        function appDelegate(appId) {
++            var appIndex = indexOf(appId);
++            return appRepeater.itemAt(appIndex);
++        }
++
++        // keymap
++        readonly property bool globalKeymapSwitching: true // TODO make this configurable in the future
++        readonly property string activeKeymap: priv.focusedAppDelegate ? priv.focusedAppDelegate.currentKeymap : "us"
++        onActiveKeymapChanged: {
++            var activeIndex = AccountsService.keymaps.indexOf(activeKeymap);
++            if (activeIndex !== -1) {
++                keymapActionGroup.activeAction.updateState(activeIndex); // tell the keyboard indicator about the active keymap
++            }
++        }
++
++        // TODO Work around http://pad.lv/1293478 until qmenumodel knows to cast
++        readonly property int stepUp: -1
++        readonly property int stepDown: 1
++
++        function nextKeymap() {
++            keymapActionGroup.nextAction.activate(stepUp);
++        }
++
++        function previousKeymap() {
++            keymapActionGroup.nextAction.activate(stepDown);
++        }
++
++        function switchKeymaps(index) { // switch all surfaces to keymap with index
++            for (var i = 0; i < appRepeater.count; i++) {
++                var appDelegate = appRepeater.itemAt(i);
++                if (appDelegate) {
++                    appDelegate.switchToKeymap(index);
++                }
++            }
++        }
++    }
++
++    QMenuModel.QDBusActionGroup {
++        id: keymapActionGroup
++        busType: QMenuModel.DBus.SessionBus
++        busName: "com.canonical.indicator.keyboard"
++        objectPath: "/com/canonical/indicator/keyboard"
++
++        property variant activeAction: action("active")
++        property variant nextAction: action("scroll")
++
++        readonly property int currentLayoutIndex: action("current") ? action("current").state : 0
++        onCurrentLayoutIndexChanged: {
++            if (priv.globalKeymapSwitching) {
++                priv.switchKeymaps(currentLayoutIndex);
++            } else if (priv.focusedAppDelegate) {
++                priv.focusedAppDelegate.switchToKeymap(currentLayoutIndex);
++            }
++        }
++
++        Component.onCompleted: {
++            keymapActionGroup.start();
++        }
+     }
      Connections {
          target: PanelState
--        onClose: {
--            ApplicationManager.stopApplication(ApplicationManager.focusedApplicationId)
--        }
++        onClose: if (priv.focusedAppDelegate) {
++                     priv.focusedAppDelegate.close()
++                 }
          onMinimize: priv.focusedAppDelegate && priv.focusedAppDelegate.minimize();
          onMaximize: priv.focusedAppDelegate // don't restore minimized apps when double clicking the panel
                      && priv.focusedAppDelegate.restoreFromMaximized();
@@ -237,7 +294,6 @@
          PanelState.dropShadow = false;
+     }
--
      FocusScope {
          id: appContainer
          objectName: "appContainer"
@@ -295,6 +351,7 @@
                  readonly property string appName: model.name
                  property bool visuallyMaximized: false
                  property bool visuallyMinimized: false
++                readonly property alias currentKeymap: decoratedWindow.currentKeymap
                  onFocusChanged: {
                      if (focus && ApplicationManager.focusedApplicationId !== appId) {
@@ -363,12 +420,12 @@
                      ApplicationManager.focusApplication(appId);
+                 }
--                function nextKeymap() {
--                    decoratedWindow.nextKeymap();
++                function switchToKeymap(index) {
++                    decoratedWindow.switchToKeymap(index);
+                 }
--                function previousKeymap() {
--                    decoratedWindow.previousKeymap();
++                function close() {
++                    state = "closing";
+                 }
                  function playFocusAnimation() {
@@ -386,6 +443,14 @@
                  states: [
                      State {
++                        name: "closing"
++                        PropertyChanges { // freeze the values
++                            target: appDelegate; explicit: true; restoreEntryValues: false;
++                            x: appDelegate.x; y: appDelegate.y
++                            requestedWidth: appDelegate.width; requestedHeight: appDelegate.height
++                        }
++                    },
++                    State {
                          name: "fullscreen"; when: decoratedWindow.fullscreen
                          PropertyChanges {
                              target: appDelegate;
@@ -400,7 +465,8 @@
                          PropertyChanges {
                              target: appDelegate;
                              visuallyMinimized: false;
--                            visuallyMaximized: false
++                            visuallyMaximized: false;
++                            opacity: 1; scale: 1
+                         }
                      },
                      State {
@@ -410,7 +476,8 @@
                              x: root.leftMargin; y: 0;
                              requestedWidth: appContainer.width - root.leftMargin; requestedHeight: appContainer.height;
                              visuallyMinimized: false;
--                            visuallyMaximized: true
++                            visuallyMaximized: true;
++                            opacity: 1; scale: 1
+                         }
                      },
                      State {
@@ -437,17 +504,32 @@
+                 ]
                  transitions: [
                      Transition {
++                        from: ",minimized"
                          to: "normal"
                          enabled: appDelegate.animationsEnabled
                          PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
--                        UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: UbuntuAnimation.FastDuration }
++                        UbuntuNumberAnimation { target: appDelegate; properties: "x,y" }
++                        UbuntuNumberAnimation {
++                            target: appDelegate
++                            property: 'scale'
++                            from: 0.85
++                            to: 1
++                            duration: UbuntuAnimation.SnapDuration
++                        }
++                        UbuntuNumberAnimation {
++                            target: appDelegate
++                            property: 'opacity'
++                            from: 0
++                            to: 1
++                            duration: UbuntuAnimation.SnapDuration
++                        }
                      },
                      Transition {
                          to: "minimized"
                          enabled: appDelegate.animationsEnabled
                          PropertyAction { target: appDelegate; property: "visuallyMaximized" }
                          SequentialAnimation {
--                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: UbuntuAnimation.FastDuration }
++                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,scale,requestedWidth,requestedHeight" }
                              PropertyAction { target: appDelegate; property: "visuallyMinimized" }
                              ScriptAction {
                                  script: {
@@ -459,11 +541,42 @@
+                         }
                      },
                      Transition {
++                        to: "closing"
++                        SequentialAnimation {
++                            PropertyAction { target: appDelegate; properties: "x,y,requestedWidth,requestedHeight" }
++                            ParallelAnimation {
++                                UbuntuNumberAnimation {
++                                    target: appDelegate
++                                    property: 'scale'
++                                    from: 1
++                                    to: 0.85
++                                    duration: UbuntuAnimation.SnapDuration
++                                    easing: UbuntuAnimation.StandardEasingReverse
++                                }
++                                UbuntuNumberAnimation {
++                                    target: appDelegate
++                                    property: 'opacity'
++                                    from: 1
++                                    to: 0
++                                    duration: UbuntuAnimation.SnapDuration
++                                    easing: UbuntuAnimation.StandardEasingReverse
++                                }
++                            }
++                            // hack: make sure the animation has really finished before closing the app
++                            PauseAnimation { duration: UbuntuAnimation.SnapDuration }
++                            ScriptAction {
++                                script: {
++                                    ApplicationManager.stopApplication(appId);
++                                }
++                            }
++                        }
++                    },
++                    Transition {
                          to: "*" //maximized and fullscreen
                          enabled: appDelegate.animationsEnabled
                          PropertyAction { target: appDelegate; property: "visuallyMinimized" }
                          SequentialAnimation {
--                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: UbuntuAnimation.FastDuration }
++                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,scale,requestedWidth,requestedHeight" }
                              PropertyAction { target: appDelegate; property: "visuallyMaximized" }
+                         }
+                     }
@@ -500,7 +613,7 @@
                      active: ApplicationManager.focusedApplicationId === model.appId
                      focus: true
--                    onClose: ApplicationManager.stopApplication(model.appId)
++                    onClose: appDelegate.close()
                      onMaximize: appDelegate.maximized || appDelegate.maximizedLeft || appDelegate.maximizedRight
                                  ? appDelegate.restoreFromMaximized() : appDelegate.maximize()
                      onMinimize: appDelegate.minimize()
 === modified file 'qml/Stages/SurfaceContainer.qml'
 --- qml/Stages/SurfaceContainer.qml	2016-02-17 21:52:09 +0000
 +++ qml/Stages/SurfaceContainer.qml	2016-02-17 21:52:10 +0000
@@ -48,32 +48,13 @@
+         }
+     }
--    function nextKeymap() {
--        var currentIndex = keymaps.indexOf(currentKeymap);
--        var nextIndex = 0;
--
--        if (currentIndex !== -1 && currentIndex < keymaps.length - 1) {
--            nextIndex = currentIndex + 1;
--        }
--
--        currentKeymap = keymaps[nextIndex];
--        var keymap = currentKeymap.split("+");
--
--        surface.setKeymap(keymap[0], keymap[1] || "");
--    }
--
--    function previousKeymap() {
--        var currentIndex = keymaps.indexOf(currentKeymap);
--        var prevIndex = keymaps.length - 1;
--
--        if (currentIndex > 0) {
--            prevIndex = currentIndex - 1;
--        }
--
--        currentKeymap = keymaps[prevIndex];
--        var keymap = currentKeymap.split("+");
--
--        surface.setKeymap(keymap[0], keymap[1] || "");
++    function switchToKeymap(index) {
++        currentKeymap = keymaps[index];
++        var keymap = currentKeymap.split("+");
++
++        if (surface) {
++            surface.setKeymap(keymap[0], keymap[1] || "");
++        }
+     }
      InputWatcher {
 === modified file 'qml/Stages/WindowResizeArea.qml'
 --- qml/Stages/WindowResizeArea.qml	2016-02-17 21:52:09 +0000
 +++ qml/Stages/WindowResizeArea.qml	2016-02-17 21:52:10 +0000
@@ -73,10 +73,10 @@
          var windowGeometry = windowStateStorage.getGeometry(root.windowId,
                                                              Qt.rect(target.x, target.y, defaultWidth, defaultHeight));
--        target.requestedWidth = Math.min(Math.max(windowGeometry.width, d.minimumWidth), screenWidth - root.leftMargin);
--        target.requestedHeight = Math.min(Math.max(windowGeometry.height, d.minimumHeight), root.screenHeight - PanelState.panelHeight);
--        target.x = Math.max(Math.min(windowGeometry.x, root.screenWidth - root.leftMargin - target.requestedWidth), root.leftMargin)
--        target.y = Math.max(Math.min(windowGeometry.y, root.screenHeight - target.requestedHeight), PanelState.panelHeight)
++        target.requestedWidth = Qt.binding(function() { return Math.min(Math.max(windowGeometry.width, d.minimumWidth), screenWidth - root.leftMargin); });
++        target.requestedHeight = Qt.binding(function() { return Math.min(Math.max(windowGeometry.height, d.minimumHeight), root.screenHeight - PanelState.panelHeight); });
++        target.x = Qt.binding(function() { return Math.max(Math.min(windowGeometry.x, root.screenWidth - root.leftMargin - target.requestedWidth), root.leftMargin); });
++        target.y = Qt.binding(function() { return Math.max(Math.min(windowGeometry.y, root.screenHeight - target.requestedHeight), PanelState.panelHeight); });
          var windowState = windowStateStorage.getState(root.windowId, WindowStateStorage.WindowStateNormal)
          if (windowState === WindowStateStorage.WindowStateMaximized) {
@@ -86,7 +86,7 @@
+     }
      Component.onDestruction: {
--        windowStateStorage.saveState(root.windowId, target.state == "maximized" ? WindowStateStorage.WindowStateMaximized : WindowStateStorage.WindowStateNormal)
++        windowStateStorage.saveState(root.windowId, target.maximized ? WindowStateStorage.WindowStateMaximized : WindowStateStorage.WindowStateNormal)
          windowStateStorage.saveGeometry(root.windowId, Qt.rect(priv.normalX, priv.normalY, priv.normalWidth, priv.normalHeight))
+     }
 === modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
 --- tests/qmltests/Stages/tst_DesktopStage.qml	2016-02-17 21:52:09 +0000
 +++ tests/qmltests/Stages/tst_DesktopStage.qml	2016-02-17 21:52:10 +0000
@@ -362,7 +362,7 @@
              verify(appDelegate);
              ApplicationManager.focusApplication(appName);
              keyClick(Qt.Key_F4, Qt.AltModifier); // Alt+F4 shortcut to close
--            verify(ApplicationManager.count == 2); // verify the app is gone
++            tryCompare(ApplicationManager, "count", 2); // verify the app is gone
              verify(ApplicationManager.findApplication(appName) === null); // and it's not in running apps
+         }
@@ -409,8 +409,8 @@
              // restore
              dialerDelegate.restoreFromMaximized();
--            compare(dashApp.session.lastSurface.visible, true);
--            compare(gmailApp.session.lastSurface.visible, true);
++            tryCompare(dashApp.session.lastSurface, "visible", true);
++            tryCompare(gmailApp.session.lastSurface, "visible", true);
+         }
          function test_applicationsBecomeVisibleWhenOccludingAppRemoved() {
 === modified file 'tests/qmltests/Stages/tst_WindowResizeArea.qml'
 --- tests/qmltests/Stages/tst_WindowResizeArea.qml	2015-11-30 18:25:47 +0000
 +++ tests/qmltests/Stages/tst_WindowResizeArea.qml	2016-02-17 21:52:10 +0000
@@ -56,6 +56,7 @@
              property real widthIncrement: 0
              property real heightIncrement: 0
              state: "normal"
++            readonly property bool maximized: state == "maximized"
              function maximize() {
                  state = "maximized"
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2016-02-17 21:52:09 +0000
 +++ tests/qmltests/tst_Shell.qml	2016-02-17 21:52:10 +0000
@@ -2117,6 +2117,7 @@
              loadShell("desktop");
              shell.usageScenario = "desktop";
              waitForRendering(shell);
++
              var appContainer = findChild(shell, "appContainer");
              var launcher = findChild(shell, "launcher");