Merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/55-snap-options into lp://qastaging/~zsombi/ubuntu-ui-toolkit/listitem-master
Proposed by
Zsombor Egri
Status: | Merged |
---|---|
Approved by: | Tim Peeters |
Approved revision: | 1314 |
Merged at revision: | 1276 |
Proposed branch: | lp://qastaging/~zsombi/ubuntu-ui-toolkit/55-snap-options |
Merge into: | lp://qastaging/~zsombi/ubuntu-ui-toolkit/listitem-master |
Prerequisite: | lp://qastaging/~zsombi/ubuntu-ui-toolkit/50-custom-delegates |
Diff against target: |
805 lines (+261/-109) 14 files modified
components.api (+2/-1) modules/Ubuntu/Components/Themes/Ambiance/ListItemPanel.qml (+25/-2) modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml (+5/-3) modules/Ubuntu/Components/plugin/uclistitem.cpp (+76/-19) modules/Ubuntu/Components/plugin/uclistitem.h (+2/-0) modules/Ubuntu/Components/plugin/uclistitem_p.h (+5/-1) modules/Ubuntu/Components/plugin/uclistitemactions.cpp (+5/-5) modules/Ubuntu/Components/plugin/uclistitemactions.h (+0/-3) modules/Ubuntu/Components/plugin/uclistitemactions_p.h (+1/-0) modules/Ubuntu/Components/plugin/uclistitemactionsattached.cpp (+0/-24) modules/Ubuntu/Components/plugin/uclistitemstyle.cpp (+12/-34) modules/Ubuntu/Components/plugin/uclistitemstyle.h (+8/-9) modules/Ubuntu/Test/UbuntuTestCase.qml (+3/-6) tests/unit_x11/tst_components/tst_listitem.qml (+117/-2) |
To merge this branch: | bzr merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/55-snap-options |
Related bugs: | |
Related blueprints: |
SDK: Design a new ListItem and layouts
(Undefined)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Peeters | Approve | ||
Review via email:
|
Commit message
Snap In/Out implementation.
To post a comment you must log in.
8 + // track drag dirrection, so we know in which direction we should snap
diRRection