Merge lp:~townsend/unity/fix-lp1251777.2 into lp:unity
Status: | Merged |
---|---|
Approved by: | Marco Trevisan (Treviño) |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3607 |
Proposed branch: | lp:~townsend/unity/fix-lp1251777.2 |
Merge into: | lp:unity |
Diff against target: |
456 lines (+23/-201) 10 files modified
plugins/unityshell/src/unityshell.cpp (+0/-21) plugins/unityshell/src/unityshell.h (+0/-2) plugins/unityshell/unityshell.xml.in (+0/-12) shortcuts/CompizShortcutModeller.cpp (+6/-6) tests/autopilot/unity/tests/test_wm_keybindings.py (+8/-0) unity-shared/PluginAdapter.cpp (+0/-69) unity-shared/PluginAdapter.h (+0/-8) unity-shared/StandaloneWindowManager.cpp (+7/-71) unity-shared/StandaloneWindowManager.h (+1/-7) unity-shared/WindowManager.h (+1/-5) |
To merge this branch: | bzr merge lp:~townsend/unity/fix-lp1251777.2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Trevisan (Treviño) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
* Revert most of lp:unity revno. 3509 as the Compiz Grid plugin is a better place to handle the Ctrl-Super-
* Expanded autopilot test to check for correct window placement when semi-maximizing and restoring.
Description of the change
= Issue =
Due to revno. 3509, when vertically semi-maximizing a window using Ctrl-Super-
= Fix =
It is better to have the Compiz Grid plugin handle this since it already handles semi-maximizing windows and duplicating code in Unity is not a worthy exercise. This basically reverts most of revno. 3509 except the test_wm_shortcuts Autopilot tests.
= Test =
Added testing of correct window placement in the semi-maximize/
PASSED: Continuous integration, rev:3607 jenkins. qa.ubuntu. com/job/ unity-ci/ 523/ jenkins. qa.ubuntu. com/job/ unity-trusty- amd64-ci/ 54 jenkins. qa.ubuntu. com/job/ unity-trusty- armhf-ci/ 54 jenkins. qa.ubuntu. com/job/ unity-trusty- i386-ci/ 57
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- ci/523/ rebuild
http://