Merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/inversemousearea-ontop into lp://qastaging/ubuntu-ui-toolkit
Proposed by
Zsombor Egri
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Zsombor Egri | ||||
Approved revision: | 814 | ||||
Merged at revision: | 814 | ||||
Proposed branch: | lp://qastaging/~zsombi/ubuntu-ui-toolkit/inversemousearea-ontop | ||||
Merge into: | lp://qastaging/ubuntu-ui-toolkit | ||||
Diff against target: |
1092 lines (+947/-2) 11 files modified
components.api (+1/-0) modules/Ubuntu/Components/plugin/inversemouseareatype.cpp (+306/-1) modules/Ubuntu/Components/plugin/inversemouseareatype.h (+12/-0) tests/unit_x11/tst_inversemousearea/InverseMouseAreaNormalEventStack.qml (+44/-0) tests/unit_x11/tst_inversemousearea/InverseMouseAreaOnTop.qml (+77/-0) tests/unit_x11/tst_inversemousearea/InverseMouseAreaOnTopNoAccept.qml (+77/-0) tests/unit_x11/tst_inversemousearea/InverseMouseAreaSensingArea.qml (+48/-0) tests/unit_x11/tst_inversemousearea/InverseMouseAreaSignals.qml (+35/-0) tests/unit_x11/tst_inversemousearea/InverseMouseAreaTopmostItem.qml (+45/-0) tests/unit_x11/tst_inversemousearea/tst_inversemousearea.pro (+7/-1) tests/unit_x11/tst_inversemousearea/tst_inversemouseareatest.cpp (+295/-0) |
||||
To merge this branch: | bzr merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/inversemousearea-ontop | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Cris Dywan | Approve | ||
Review via email:
|
Commit message
Introducing topmostItem property to drive whether InverseMouseArea should filter sensingArea events or to stay in the normal z-order/stack order of its parent.
To post a comment you must log in.
PASSED: Continuous integration, rev:811 jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- ci/1108/ jenkins. qa.ubuntu. com/job/ generic- mediumtests- trusty/ 149 jenkins. qa.ubuntu. com/job/ generic- mediumtests- trusty- touch/143 jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- trusty- amd64-ci/ 56 jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- trusty- armhf-ci/ 56 jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- trusty- armhf-ci/ 56/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-trusty/ 140 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- trusty- amd64/149 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- trusty- amd64/149/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- trusty- armhf/143 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- trusty- armhf/143/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- mediumtests- runner- maguro/ 2770 jenkins. qa.ubuntu. com/job/ generic- mediumtests- runner- mako/2820 10.97.0. 26:8080/ job/touch- flash-device/ 579 10.97.0. 26:8080/ job/touch- flash-device/ 577
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 10.97.0. 26:8080/ job/ubuntu- ui-toolkit- ci/1108/ rebuild
http://