1
=== modified file 'src/Ubuntu/UbuntuToolkit/uclistitemlayout.cpp'
2
--- src/Ubuntu/UbuntuToolkit/uclistitemlayout.cpp	2016-07-18 17:18:13 +0000
3
+++ src/Ubuntu/UbuntuToolkit/uclistitemlayout.cpp	2016-07-22 18:17:27 +0000
4
@@ -64,6 +64,28 @@
5
64
    we made it possible to tweak the position of each slot by modifying
64
    we made it possible to tweak the position of each slot by modifying
6
65
    its attached properties (see \l {Advanced layout tweaks}).
65
    its attached properties (see \l {Advanced layout tweaks}).
7
66
66
8
67
    \b Note that if you're wrapping the ListItemLayout in a container such
9
68
    as \l {ListItem}, \b {you will have to specify the height of the container so that
10
69
    it follows ListItemLayout's height}, otherwise the layout content may appear clipped or
11
70
    not vertically centered.
12
71
13
72
    See \b {\l {Resizing the layout} {here}} for more details. Here's an example:
14
73
    \qml
15
74
    import QtQuick 2.4
16
75
    import Ubuntu.Component 1.3
17
76
    ListItem {
18
77
        //CORRECT, ListItem will be tall enough to accomodate all the content
19
78
        height: layout.height + (divider.visible ? divider.height : 0)
20
79
21
80
        ListItemLayout {
22
81
            id: layout
23
82
            title.text: "Hello developers!"
24
83
            subtitle.text: "I am a ListItemLayout"
25
84
            summary.text: "I resize automatically to accomodate all the elements I hold. My parents should track my height property!"
26
85
        }
27
86
    }
28
87
    \endqml
29
88
30
67
    If you need a progression symbol in your list item,
89
    If you need a progression symbol in your list item,
31
68
    just add \l ProgressionSlot as a child of your ListItemLayout.
90
    just add \l ProgressionSlot as a child of your ListItemLayout.
32
69
    No manual positioning is needed, the layout will handle it for you.
91
    No manual positioning is needed, the layout will handle it for you.
33
70
92
34
=== modified file 'src/Ubuntu/UbuntuToolkit/ucslotslayout.cpp'
35
--- src/Ubuntu/UbuntuToolkit/ucslotslayout.cpp	2016-07-07 08:42:42 +0000
36
+++ src/Ubuntu/UbuntuToolkit/ucslotslayout.cpp	2016-07-22 18:17:27 +0000
37
@@ -703,7 +703,7 @@
38
703
    \qml
703
    \qml
39
704
    ListItem {
704
    ListItem {
40
705
        //CORRECT
705
        //CORRECT
42
706
        height: layout.height + divider.height
706
        height: layout.height + (divider.visible ? divider.height : 0)
43
707
707
44
708
        SlotsLayout {
708
        SlotsLayout {
45
709
            id: layout
709
            id: layout
46
@@ -765,7 +765,7 @@
47
765
765
48
766
    \qml
766
    \qml
49
767
    ListItem {
767
    ListItem {
51
768
        height: layout.height + divider.height
768
        height: layout.height + (divider.visible ? divider.height : 0)
52
769
        onClicked: console.log("clicked!")
769
        onClicked: console.log("clicked!")
53
770
770
54
771
        SlotsLayout {
771
        SlotsLayout {
Status:	Merged
Approved by:	Andrea Bernabei on 2016-07-26
Approved revision:	1829
Merged at revision:	2042
Proposed branch:	lp:~faenil/ubuntu-ui-toolkit/moreListItemLayoutDocs_again
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	54 lines (+24/-2) 2 files modified src/Ubuntu/UbuntuToolkit/uclistitemlayout.cpp (+22/-0) src/Ubuntu/UbuntuToolkit/ucslotslayout.cpp (+2/-2)
To merge this branch:	bzr merge lp:~faenil/ubuntu-ui-toolkit/moreListItemLayoutDocs_again
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-07-26
Cris Dywan		2016-07-22	Approve on 2016-07-26
Review via email: mp+300928@code.launchpad.net