Merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/listItemExpandContent into lp://qastaging/ubuntu-ui-toolkit/staging
Proposed by
Zsombor Egri
Status: | Work in progress |
---|---|
Proposed branch: | lp://qastaging/~zsombi/ubuntu-ui-toolkit/listItemExpandContent |
Merge into: | lp://qastaging/ubuntu-ui-toolkit/staging |
Prerequisite: | lp://qastaging/~zsombi/ubuntu-ui-toolkit/listitem_expansion |
Diff against target: |
832 lines (+476/-34) 10 files modified
components.api (+4/-0) examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml (+0/-1) examples/ubuntu-ui-toolkit-gallery/NewListItems.qml (+117/-1) src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml (+159/-10) src/Ubuntu/Components/plugin/privates/listitemexpansion.cpp (+72/-0) src/Ubuntu/Components/plugin/uclistitem.cpp (+69/-5) src/Ubuntu/Components/plugin/uclistitem.h (+14/-0) src/Ubuntu/Components/plugin/uclistitem_p.h (+2/-0) src/Ubuntu/Components/plugin/ucviewitemsattached.cpp (+8/-1) tests/resources/listitems/ListItemExpansion.qml (+31/-16) |
To merge this branch: | bzr merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/listItemExpandContent |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu SDK team | Pending | ||
Review via email:
|
To post a comment you must log in.
Unmerged revisions
- 1640. By Zsombor Egri
-
lock expanded when content is Flickable
- 1639. By Zsombor Egri
-
small tweaks to avoid expanded being highlighted when the expanded content is scrollable
- 1638. By Zsombor Egri
-
simplifying transitions
- 1637. By Zsombor Egri
-
sync
- 1636. By Zsombor Egri
-
few examples in gallery
- 1635. By Zsombor Egri
-
docs updated
- 1634. By Zsombor Egri
-
overlapping content support
- 1633. By Zsombor Egri
-
API updated
- 1632. By Zsombor Egri
-
rename hideCollapsedCo
ntent with overlapListItem - 1631. By Zsombor Egri
-
contentItem added, expansion under ListItem.
contentItem implemented