Unity

Merge lp://qastaging/~3v1n0/unity/alt+tab-escape-regression-fix into lp://qastaging/unity

alt+tab-escape-regression-fix
Merge into trunk

Proposed by Marco Trevisan (Treviño) on 2012-03-06

Status:

Merged

Approved by:

Tim Penhey on 2012-03-07

Approved revision:

no longer in the source branch.

Merged at revision:

2057

Proposed branch:

lp://qastaging/~3v1n0/unity/alt+tab-escape-regression-fix

Merge into:

lp://qastaging/unity

Diff against target:

173 lines (+84/-11)

4 files modified

plugins/unityshell/src/unityshell.cpp (+29/-11)
plugins/unityshell/src/unityshell.h (+1/-0)
tests/autopilot/autopilot/emulators/unity/switcher.py (+5/-0)
tests/autopilot/autopilot/tests/test_switcher.py (+49/-0)

To merge this branch:

bzr merge lp://qastaging/~3v1n0/unity/alt+tab-escape-regression-fix

Medium

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Tim Penhey (community)		Approve on 2012-03-07
Thomi Richards (community)	2012-03-06	Approve on 2012-03-06
Review via email: mp+96223@code.qastaging.launchpad.net

Description of the change

UnityScreen: don't ungrab the keyboard on Alt press if switcher is active

When the Alt+Tab switcher is active is the keyboard must not be ungrabbed or the Alt+Tab cancel action won't work (i.e. escaping from switcher by Escape key).
This fixes a regression introduced recently. I've also included AP tests to check if the cancel action works.

UNBLOCK

Revision history for this message

Thomi Richards (thomir-deactivatedaccount) wrote on 2012-03-06:

Looks good

review: Approve

Revision history for this message

Tim Penhey (thumper) wrote on 2012-03-07:

Seems OK except extra unneeded asserts that are checking the same thing in multiple tests. Would also be useful to have comments as to why some of the cleanup code is needed, ie. cancel to avoid actually switching.

review: Approve

Revision history for this message

Marco Trevisan (Treviño) (3v1n0) wrote on 2012-03-07:

Yes, we'd need to check if the cancel is actually working. But that would need some more bamf integration in AP I guess.

The redundant checks are there due to the nature of the AP tests that can be even independent.