Merge lp://qastaging/~gordallott/unity/fix-wrong-horizontal-see-more-size into lp://qastaging/~gordallott/unity/fix-standalone-dash-client-build
Proposed by
Gord Allott
| Status: | Superseded | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://qastaging/~gordallott/unity/fix-wrong-horizontal-see-more-size | ||||
| Merge into: | lp://qastaging/~gordallott/unity/fix-standalone-dash-client-build | ||||
| Diff against target: |
2936 lines (+1166/-490) 38 files modified
UnityCore/Hud.h (+1/-1) UnityCore/Variant.cpp (+6/-0) UnityCore/Variant.h (+1/-0) manual-tests/Dash.txt (+13/-0) manual-tests/SuperTab.txt (+1/-20) plugins/unityshell/src/GestureEngine.cpp (+8/-3) plugins/unityshell/src/HudButton.cpp (+3/-2) plugins/unityshell/src/HudController.cpp (+4/-1) plugins/unityshell/src/HudIconTextureSource.cpp (+51/-38) plugins/unityshell/src/HudView.cpp (+140/-28) plugins/unityshell/src/HudView.h (+2/-1) plugins/unityshell/src/IMTextEntry.cpp (+77/-8) plugins/unityshell/src/IMTextEntry.h (+12/-0) plugins/unityshell/src/Launcher.cpp (+2/-1) plugins/unityshell/src/LauncherController.cpp (+2/-2) plugins/unityshell/src/PlacesGroup.cpp (+8/-1) plugins/unityshell/src/PlacesGroup.h (+2/-1) plugins/unityshell/src/ResultView.h (+2/-0) plugins/unityshell/src/ResultViewGrid.cpp (+1/-0) plugins/unityshell/src/unityshell.cpp (+45/-19) tests/autopilot/autopilot/emulators/X11.py (+42/-16) tests/autopilot/autopilot/emulators/unity/__init__.py (+38/-9) tests/autopilot/autopilot/emulators/unity/dash.py (+22/-5) tests/autopilot/autopilot/emulators/unity/hud.py (+24/-1) tests/autopilot/autopilot/emulators/unity/icons.py (+0/-2) tests/autopilot/autopilot/emulators/unity/launcher.py (+119/-107) tests/autopilot/autopilot/emulators/unity/quicklist.py (+1/-4) tests/autopilot/autopilot/emulators/unity/switcher.py (+10/-1) tests/autopilot/autopilot/keybindings.py (+3/-0) tests/autopilot/autopilot/tests/__init__.py (+28/-20) tests/autopilot/autopilot/tests/test_command_lens.py (+0/-2) tests/autopilot/autopilot/tests/test_dash.py (+35/-11) tests/autopilot/autopilot/tests/test_hud.py (+68/-37) tests/autopilot/autopilot/tests/test_invisible_windows.py (+12/-10) tests/autopilot/autopilot/tests/test_launcher.py (+362/-122) tests/autopilot/autopilot/tests/test_showdesktop.py (+5/-14) tests/autopilot/autopilot/tests/test_switcher.py (+11/-2) tools/autopilot (+5/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~gordallott/unity/fix-wrong-horizontal-see-more-size | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Gord Allott | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2012-03-06.
Description of the change
Fixes the attached bug, manual test supplied has instructions to test
No automatic test until I can figure out a nice way of doing it,
Feels like we need to run the AP tests with fake lenses to control the dash content
Which is entirely out of scope for this merge
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
