Ubuntu UI Toolkit

Merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/listItemContentDrag into lp://qastaging/ubuntu-ui-toolkit/staging

listItemContentDrag
Merge into staging

Proposed by Zsombor Egri on 2015-10-26

Status:

Merged

Approved by:

Cris Dywan on 2015-10-26

Approved revision:

1704

Merged at revision:

1704

Proposed branch:

lp://qastaging/~zsombi/ubuntu-ui-toolkit/listItemContentDrag

Merge into:

lp://qastaging/ubuntu-ui-toolkit/staging

Diff against target:

238 lines (+140/-2)

5 files modified

components.api (+1/-0)
src/Ubuntu/Components/plugin/uclistitem.cpp (+53/-2)
src/Ubuntu/Components/plugin/uclistitem.h (+4/-0)
src/Ubuntu/Components/plugin/uclistitem_p.h (+1/-0)
tests/unit_x11/tst_components/tst_listitem_extras.qml (+81/-0)

To merge this branch:

bzr merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/listItemContentDrag

Related bugs:

Bug #1499437: [desktop] Dragging a bookmark to a folder activates the bookmark	Undecided	In Progress
Bug #1500409: Dragging within a ListItem does not work	Critical	Fix Released
Bug #1500416: Swiping should not be possible when leadingActions or trailingActions is an empty list	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Cris Dywan		2015-10-26	Approve on 2015-10-26
PS Jenkins bot	continuous-integration		Approve on 2015-10-26
Review via email: mp+275691@code.qastaging.launchpad.net

Commit message

Add ListItem.swipeEnabled property to block swiping when overlay MouseArea is used to drag content. Fixes swiping when leading/trailing actions list is empty.