Merge lp:~mir-team/mir/fix-new-input-dispatcher-and-hang-head-in-shame into lp:mir
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Daniel van Vugt | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 2656 | ||||
Proposed branch: | lp:~mir-team/mir/fix-new-input-dispatcher-and-hang-head-in-shame | ||||
Merge into: | lp:mir | ||||
Diff against target: |
93 lines (+17/-7) 4 files modified
src/server/input/default_configuration.cpp (+5/-4) src/server/input/key_repeat_dispatcher.cpp (+9/-2) src/server/input/key_repeat_dispatcher.h (+2/-0) tests/unit-tests/input/test_key_repeat_dispatcher.cpp (+1/-1) |
||||
To merge this branch: | bzr merge lp:~mir-team/mir/fix-new-input-dispatcher-and-hang-head-in-shame | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Approve | ||
Alberto Aguirre (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+261773@code.launchpad.net |
Commit message
Fix key repeat dispatcher (touch events not working at all)
(LP: #1464174)
Description of the change
Correct: https:/
The error is obvious if you look at the key_repeat_
It wasn't caught in the tests because the KeyRepeatDispatcher wasn't installed (due to key repeat being disabled to not make the tests timing dependent). I've changed the way key repeat is configured in a way which would have caught this bug. I think the value of this could be argued about though (as the way repeat_enabled is implemented makes it unlikely this would catch future bugs).
PASSED: Continuous integration, rev:2655 jenkins. qa.ubuntu. com/job/ mir-ci/ 4084/ jenkins. qa.ubuntu. com/job/ mir-android- vivid-i386- build/2824 jenkins. qa.ubuntu. com/job/ mir-clang- wily-amd64- build/337 jenkins. qa.ubuntu. com/job/ mir-mediumtests -vivid- touch/2772 jenkins. qa.ubuntu. com/job/ mir-wily- amd64-ci/ 240 jenkins. qa.ubuntu. com/job/ mir-wily- amd64-ci/ 240/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 2772 jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 2772/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -runner- mako/5606 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 21150
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mir- ci/4084/ rebuild
http://