Merge lp:~mterry/ubuntu-ui-toolkit/monitor-only into lp:ubuntu-ui-toolkit/staging
Status: | Merged |
---|---|
Approved by: | Zsombor Egri |
Approved revision: | 1281 |
Merged at revision: | 1886 |
Proposed branch: | lp:~mterry/ubuntu-ui-toolkit/monitor-only |
Merge into: | lp:ubuntu-ui-toolkit/staging |
Diff against target: |
314 lines (+179/-6) 6 files modified
components.api (+2/-0) src/Ubuntu/UbuntuGestures/ucswipearea.cpp (+52/-5) src/Ubuntu/UbuntuGestures/ucswipearea_p.h (+5/-0) src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h (+1/-0) tests/unit_x11/tst_swipearea/DownwardsLauncher.qml (+14/-0) tests/unit_x11/tst_swipearea/tst_swipearea.cpp (+105/-1) |
To merge this branch: | bzr merge lp:~mterry/ubuntu-ui-toolkit/monitor-only |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
ubuntu-sdk-build-bot | continuous-integration | Approve | |
Zsombor Egri | Approve | ||
Timo Jyrinki | trigger ci for non-sdk-team member | Approve | |
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+282034@code.launchpad.net |
This proposal supersedes a proposal from 2015-12-17.
Commit message
Add grabGesture field to SwipeArea.
This field controls whether the SwipeArea takes ownership of the gestures it observes.
Description of the change
From linked bug:
== Ask ==
I want to add SwipeArea.
I have a specific need for it, but it might be a generally useful thing?
== Backstory ==
Recently, the UITK got SwipeArea, which is great. In unity8, I'm working on a redesign of the edge introduction tutorial on first boot of your device.
There's a part of it where we put a shell-wide overlay on top of the screen that says "Swipe from the bottom to do ..." and this should fade out as the user swipes up (but should do the right thing if the drag isn't completed or is held in place).
One way to do this would be to communicate with the app. But that's a lot of infrastructure for one little feature. And this feature might be short-lived, because eventually we're going to try to move those "coach mark" help screens in the UITK as well for apps to use themselves. But for now, the shell is showing the bottom edge coach mark for a select few apps.
So another easy way to do it is to be able to monitor the user's drag, but not interfere with it. So the shell can see what the drag is doing, but the app still does the drag itself.
== Next Steps ==
I'd like this branch reviewed for sanity, to see if it's something you folks are OK with. It's missing tests, but I'm waiting to add those until you all let me know it wouldn't be wasted effort. :)
FAILED: Continuous integration, rev:1272 jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- ci/2246/ jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- vivid-amd64- ci/70/console jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- vivid-armhf- ci/70/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- ui-toolkit- ci/2246/ rebuild
http://