1
=== modified file 'components.api'
2
--- components.api	2014-12-18 10:08:56 +0000
3
+++ components.api	2015-01-16 14:53:38 +0000
4
@@ -867,6 +867,7 @@
5
867
    name: "UCListItem"
867
    name: "UCListItem"
6
868
    prototype: "UCStyledItemBase"
868
    prototype: "UCStyledItemBase"
7
869
    exports: ["ListItem 1.2"]
869
    exports: ["ListItem 1.2"]
8
870
    name: "PanelStatus"
9
870
    Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
871
    Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
10
871
    Property { name: "divider"; type: "UCListItemDivider"; isReadonly: true; isPointer: true }
872
    Property { name: "divider"; type: "UCListItemDivider"; isReadonly: true; isPointer: true }
11
872
    Property { name: "leadingActions"; type: "UCListItemActions"; isPointer: true }
873
    Property { name: "leadingActions"; type: "UCListItemActions"; isPointer: true }
12
@@ -886,26 +887,19 @@
13
886
    name: "UCListItemActions"
887
    name: "UCListItemActions"
14
887
    prototype: "QObject"
888
    prototype: "QObject"
15
888
    exports: ["ListItemActions 1.2"]
889
    exports: ["ListItemActions 1.2"]
16
889
    name: "Status"
17
890
    Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
890
    Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
18
891
    Property { name: "actions"; type: "UCAction"; isList: true; isReadonly: true }
891
    Property { name: "actions"; type: "UCAction"; isList: true; isReadonly: true }
19
892
    Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
892
    Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
24
893
    Signal {
893
    name: "UCListItemAttached"
21
894
    name: "statusChanged"
22
895
    Parameter { name: "status"; type: "Status" }
23
896
    name: "UCListItemActionsAttached"
25
897
    prototype: "QObject"
894
    prototype: "QObject"
27
898
    Property { name: "container"; type: "UCListItemActions"; isReadonly: true; isPointer: true }
895
    Property { name: "actions"; type: "UCListItemActions"; isReadonly: true; isPointer: true }
28
899
    Property { name: "visibleActions"; type: "UCAction"; isList: true; isReadonly: true }
896
    Property { name: "visibleActions"; type: "UCAction"; isList: true; isReadonly: true }
34
900
    Property { name: "listItem"; type: "UCListItem"; isReadonly: true; isPointer: true }
897
    Property { name: "item"; type: "UCListItem"; isReadonly: true; isPointer: true }
35
901
    Property { name: "listItemIndex"; type: "int"; isReadonly: true }
898
    Property { name: "index"; type: "int"; isReadonly: true }
36
902
    Property { name: "offset"; type: "double"; isReadonly: true }
899
    Property { name: "panelStatus"; type: "UCListItem::PanelStatus"; isReadonly: true }
32
903
    Property { name: "status"; type: "UCListItemActions::Status"; isReadonly: true }
33
904
    Property { name: "swiping"; type: "bool"; isReadonly: true }
37
905
    Method {
900
    Method {
38
906
    name: "snapToPosition"
901
    name: "snapToPosition"
39
907
    Parameter { name: "position"; type: "double" }
902
    Parameter { name: "position"; type: "double" }
40
908
    Component { name: "UCListItemAttached"; prototype: "QObject" }
41
909
    name: "UCListItemDivider"
903
    name: "UCListItemDivider"
42
910
    prototype: "QObject"
904
    prototype: "QObject"
43
911
    Property { name: "visible"; type: "bool" }
905
    Property { name: "visible"; type: "bool" }
44
@@ -1010,6 +1004,9 @@
45
1010
    Signal {
1004
    Signal {
46
1011
    name: "opened"
1005
    name: "opened"
47
1012
    Parameter { name: "uris"; type: "QStringList" }
1006
    Parameter { name: "uris"; type: "QStringList" }
48
1007
    name: "UCViewItemsAttached"
49
1008
    prototype: "QObject"
50
1009
    exports: ["ViewItems 1.2"]
51
1013
    name: "UbuntuI18n"
1010
    name: "UbuntuI18n"
52
1014
    prototype: "QObject"
1011
    prototype: "QObject"
53
1015
    exports: ["i18n 0.1", "i18n 1.0"]
1012
    exports: ["i18n 0.1", "i18n 1.0"]
54
1016
1013
55
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ListItemPanel.qml'
56
--- modules/Ubuntu/Components/Themes/Ambiance/ListItemPanel.qml	2014-12-17 07:06:31 +0000
57
+++ modules/Ubuntu/Components/Themes/Ambiance/ListItemPanel.qml	2015-01-16 14:53:38 +0000
58
@@ -38,32 +38,29 @@
59
38
    /*
38
    /*
60
39
      Specifies the width of the component visualizing the action.
39
      Specifies the width of the component visualizing the action.
61
40
      */
40
      */
63
41
    property real visualizedActionWidth: units.gu(2.5)
41
    property real paintedActionWidth: units.gu(2.5)
64
42
42
65
43
    // panel implementation
43
    // panel implementation
66
44
    id: panel
44
    id: panel
67
45
    width: Math.max(
45
    width: Math.max(
68
46
               actionsRow.childrenRect.width,
46
               actionsRow.childrenRect.width,
70
47
               ListItemActions.visibleActions.length * MathUtils.clamp(visualizedActionWidth, height, actionsRow.maxItemWidth))
47
               ListItem.visibleActions.length * MathUtils.clamp(paintedActionWidth, height, actionsRow.maxItemWidth))
71
48
48
72
49
    // used for module/autopilot testing
49
    // used for module/autopilot testing
73
50
    objectName: "ListItemPanel" + (leading ? "Leading" : "Trailing")
50
    objectName: "ListItemPanel" + (leading ? "Leading" : "Trailing")
74
51
51
75
52
    /*
52
    /*
76
53
      Property holding the ListItem's contentItem instance
77
54
      */
78
55
    readonly property Item contentItem: parent ? parent.contentItem : null
79
56
80
57
    /*
81
58
      Specifies whether the panel is used to visualize leading or trailing actions.
53
      Specifies whether the panel is used to visualize leading or trailing actions.
82
59
      */
54
      */
84
60
    readonly property bool leading: panel.ListItemActions.status == panel.ListItemActions.Leading
55
    readonly property bool leading: ListItem.panelStatus == ListItem.Leading
85
56
    readonly property real swipedOffset: leading ? width + x : ListItem.item.width - x;
86
57
    readonly property bool swiping: ListItem.item.highlighted && ListItem.item.contentMoving
87
61
58
88
62
    anchors {
59
    anchors {
93
63
        left: contentItem ? (leading ? undefined : contentItem.right) : undefined
60
        left: leading ? undefined : ListItem.item.contentItem.right
94
64
        right: contentItem ? (leading ? contentItem.left : undefined) : undefined
61
        right: leading ? ListItem.item.contentItem.left : undefined
95
65
        top: contentItem ? contentItem.top : undefined
62
        top: ListItem.item.contentItem.top
96
66
        bottom: contentItem ? contentItem.bottom : undefined
63
        bottom: ListItem.item.contentItem.bottom
97
67
    }
64
    }
98
68
65
99
69
    Rectangle {
66
    Rectangle {
100
@@ -71,17 +68,21 @@
101
71
        anchors {
68
        anchors {
102
72
            fill: parent
69
            fill: parent
103
73
            // add 4 times the overshoot margins to cover the background when tugged
70
            // add 4 times the overshoot margins to cover the background when tugged
106
74
            leftMargin: (leading && panel.ListItemActions.listItem) ? -units.gu(4 * panel.ListItemActions.listItem.swipeOvershoot) : 0
71
            leftMargin: (leading && panel.ListItem.item) ? -units.gu(4 * panel.ListItem.item.swipeOvershoot) : 0
107
75
            rightMargin: (!leading && panel.ListItemActions.listItem) ? -units.gu(4 * panel.ListItemActions.listItem.swipeOvershoot) : 0
72
            rightMargin: (!leading && panel.ListItem.item) ? -units.gu(4 * panel.ListItem.item.swipeOvershoot) : 0
108
76
        }
73
        }
109
77
        color: panel.backgroundColor
74
        color: panel.backgroundColor
110
78
    }
75
    }
111
79
76
112
80
    // handle action triggering
77
    // handle action triggering
117
81
    ListItemActions.onStatusChanged: {
78
    Connections {
118
82
        if (ListItemActions.status === ListItemActions.Disconnected && actionsRow.selectedAction) {
79
        target: panel.ListItem.item
119
83
            actionsRow.selectedAction.trigger(actionsRow.listItemIndex >= 0 ? actionsRow.listItemIndex : null);
80
        onContentMovementEnded: {
120
84
            actionsRow.selectedAction = null;
81
            if (actionsRow.selectedAction) {
121
82
                actionsRow.selectedAction.trigger(actionsRow.listItemIndex);
122
83
                actionsRow.listItemIndex = -1;
123
84
                actionsRow.selectedAction = null;
124
85
            }
125
85
        }
86
        }
126
86
    }
87
    }
127
87
88
128
@@ -101,8 +102,8 @@
129
101
        prevX = x;
102
        prevX = x;
130
102
    }
103
    }
131
103
    // default snapping!
104
    // default snapping!
134
104
    ListItemActions.onSwipingChanged: {
105
    onSwipingChanged: {
135
105
        if (ListItemActions.swiping) {
106
        if (swiping) {
136
106
            // the dragging got started, set prevX
107
            // the dragging got started, set prevX
137
107
            prevX = panel.x;
108
            prevX = panel.x;
138
108
            return;
109
            return;
139
@@ -111,8 +112,8 @@
140
111
            return;
112
            return;
141
112
        }
113
        }
142
113
        // snap in if the offset is bigger than the overshoot and the direction of the drag is to reveal the panel
114
        // snap in if the offset is bigger than the overshoot and the direction of the drag is to reveal the panel
145
114
        var snapPos = (ListItemActions.offset > ListItemActions.listItem.swipeOvershoot && snapIn) ? panel.width : 0.0;
115
        var snapPos = (swipedOffset > units.gu(2) && snapIn) ? panel.width : 0.0;
146
115
        ListItemActions.snapToPosition(snapPos);
116
        ListItem.snapToPosition(snapPos);
147
116
    }
117
    }
148
117
118
149
118
    Row {
119
    Row {
150
@@ -124,13 +125,13 @@
151
124
            leftMargin: spacing
125
            leftMargin: spacing
152
125
        }
126
        }
153
126
127
155
127
        property real maxItemWidth: panel.parent ? (panel.parent.width / panel.ListItemActions.visibleActions.length) : 0
128
        property real maxItemWidth: panel.ListItem.item.width / panel.ListItem.visibleActions.length
156
128
129
157
129
        property Action selectedAction
130
        property Action selectedAction
159
130
        property int listItemIndex
131
        property int listItemIndex: -1
160
131
132
161
132
        Repeater {
133
        Repeater {
163
133
            model: panel.ListItemActions.visibleActions
134
            model: panel.ListItem.visibleActions
164
134
            AbstractButton {
135
            AbstractButton {
165
135
                id: actionButton
136
                id: actionButton
166
136
                action: modelData
137
                action: modelData
167
@@ -143,8 +144,8 @@
168
143
                }
144
                }
169
144
                function trigger() {
145
                function trigger() {
170
145
                    actionsRow.selectedAction = modelData;
146
                    actionsRow.selectedAction = modelData;
173
146
                    actionsRow.listItemIndex = panel.ListItemActions.listItemIndex;
147
                    actionsRow.listItemIndex = panel.ListItem.index;
174
147
                    panel.ListItemActions.snapToPosition(0.0);
148
                    panel.ListItem.snapToPosition(0.0);
175
148
                }
149
                }
176
149
150
177
150
                Rectangle {
151
                Rectangle {
178
@@ -156,7 +157,7 @@
179
156
                Loader {
157
                Loader {
180
157
                    id: delegateLoader
158
                    id: delegateLoader
181
158
                    height: parent.height
159
                    height: parent.height
183
159
                    sourceComponent: panel.ListItemActions.container.delegate ? panel.ListItemActions.container.delegate : defaultDelegate
160
                    sourceComponent: panel.ListItem.actions.delegate ? panel.ListItem.actions.delegate : defaultDelegate
184
160
                    property Action action: modelData
161
                    property Action action: modelData
185
161
                    property int index: index
162
                    property int index: index
186
162
                    property bool pressed: actionButton.pressed
163
                    property bool pressed: actionButton.pressed
187
@@ -177,7 +178,7 @@
188
177
        Item {
178
        Item {
189
178
            width: height
179
            width: height
190
179
            Icon {
180
            Icon {
192
180
                width: panel.visualizedActionWidth
181
                width: panel.paintedActionWidth
193
181
                height: width
182
                height: width
194
182
                name: action.iconName
183
                name: action.iconName
195
183
                color: panel.foregroundColor
184
                color: panel.foregroundColor
196
184
185
197
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml'
198
--- modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml	2014-12-01 11:13:10 +0000
199
+++ modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml	2015-01-16 14:53:38 +0000
200
@@ -30,7 +30,6 @@
201
30
            period: 0.5
30
            period: 0.5
202
31
        }
31
        }
203
32
        duration: UbuntuAnimation.BriskDuration
32
        duration: UbuntuAnimation.BriskDuration
204
33
        alwaysRunToEnd: true
205
34
    }
33
    }
206
35
34
207
36
}
35
}
208
37
36
209
=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
210
--- modules/Ubuntu/Components/plugin/plugin.cpp	2014-12-03 14:43:27 +0000
211
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2015-01-16 14:53:38 +0000
212
@@ -171,6 +171,7 @@
213
171
    qmlRegisterType<UCListItem, 2>(uri, 1, 2, "ListItem");
171
    qmlRegisterType<UCListItem, 2>(uri, 1, 2, "ListItem");
214
172
    qmlRegisterType<UCListItemDivider>();
172
    qmlRegisterType<UCListItemDivider>();
215
173
    qmlRegisterType<UCListItemActions, 2>(uri, 1, 2, "ListItemActions");
173
    qmlRegisterType<UCListItemActions, 2>(uri, 1, 2, "ListItemActions");
216
174
    qmlRegisterUncreatableType<UCViewItemsAttached, 2>(uri, 1, 2, "ViewItems", "Not instantiable");
217
174
}
175
}
218
175
176
219
176
void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
177
void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
220
177
178
221
=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
222
--- modules/Ubuntu/Components/plugin/plugin.pro	2014-12-03 14:43:27 +0000
223
+++ modules/Ubuntu/Components/plugin/plugin.pro	2015-01-16 14:53:38 +0000
224
@@ -111,10 +111,11 @@
225
111
    adapters/actionsproxy_p.cpp \
111
    adapters/actionsproxy_p.cpp \
226
112
    uclistitem.cpp \
112
    uclistitem.cpp \
227
113
    uclistitemactions.cpp \
113
    uclistitemactions.cpp \
229
114
    uclistitemactionsattached.cpp \
114
    propertychange_p.cpp \
230
115
    uclistitemstyle.cpp \
231
116
    ucviewitemsattached.cpp \
232
115
    uclistitemattached.cpp \
117
    uclistitemattached.cpp \
235
116
    propertychange_p.cpp \
118
    ucactionpanel_p.cpp
234
117
    uclistitemstyle.cpp
236
118
119
237
119
# adapters
120
# adapters
238
120
SOURCES += adapters/alarmsadapter_organizer.cpp
121
SOURCES += adapters/alarmsadapter_organizer.cpp
239
121
122
240
=== modified file 'modules/Ubuntu/Components/plugin/ucaction.h'
241
--- modules/Ubuntu/Components/plugin/ucaction.h	2014-12-01 13:42:47 +0000
242
+++ modules/Ubuntu/Components/plugin/ucaction.h	2015-01-16 14:53:38 +0000
243
@@ -87,7 +87,7 @@
244
87
    Type m_parameterType;
87
    Type m_parameterType;
245
88
88
246
89
    friend class UCActionContext;
89
    friend class UCActionContext;
248
90
    friend class UCListItemActionsAttached;
90
    friend class UCListItemAttached;
249
91
    friend class UCListItemActionsPrivate;
91
    friend class UCListItemActionsPrivate;
250
92
92
251
93
    bool isValidType(QVariant::Type valueType);
93
    bool isValidType(QVariant::Type valueType);
252
94
94
253
=== added file 'modules/Ubuntu/Components/plugin/ucactionpanel_p.cpp'
254
--- modules/Ubuntu/Components/plugin/ucactionpanel_p.cpp	1970-01-01 00:00:00 +0000
255
+++ modules/Ubuntu/Components/plugin/ucactionpanel_p.cpp	2015-01-16 14:53:38 +0000
256
@@ -0,0 +1,132 @@
257
1
/*
258
2
 * Copyright 2015 Canonical Ltd.
259
3
 *
260
4
 * This program is free software; you can redistribute it and/or modify
261
5
 * it under the terms of the GNU Lesser General Public License as published by
262
6
 * the Free Software Foundation; version 3.
263
7
 *
264
8
 * This program is distributed in the hope that it will be useful,
265
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
266
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
267
11
 * GNU Lesser General Public License for more details.
268
12
 *
269
13
 * You should have received a copy of the GNU Lesser General Public License
270
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
271
15
 */
272
16
273
17
#include "uclistitemactions.h"
274
18
#include "uclistitemactions_p.h"
275
19
#include "uclistitem_p.h"
276
20
#include "quickutils.h"
277
21
#include "i18n.h"
278
22
#include "plugin.h"
279
23
#include <QtQml/QQmlInfo>
280
24
#include "ucaction.h"
281
25
#include "ucunits.h"
282
26
#include "uclistitemstyle.h"
283
27
284
28
UCActionPanel::UCActionPanel(UCListItem *item, bool leading)
285
29
    : QObject(item)
286
30
    , listItem(item)
287
31
    , panelItem(0)
288
32
    , status(UCListItem::None)
289
33
    , leading(leading)
290
34
    , connected(false)
291
35
{
292
36
293
37
}
294
38
295
39
UCActionPanel::~UCActionPanel()
296
40
{
297
41
}
298
42
299
43
UCListItemAttached *UCActionPanel::attachedObject()
300
44
{
301
45
    if (!panelItem) {
302
46
        return 0;
303
47
    }
304
48
    return static_cast<UCListItemAttached*>(
305
49
                qmlAttachedPropertiesObject<UCListItem>(panelItem, false));
306
50
}
307
51
308
52
bool UCActionPanel::createPanel(QQmlComponent *panelDelegate)
309
53
{
310
54
    if (panelItem || !panelDelegate) {
311
55
        return false;
312
56
    }
313
57
    if (!panelDelegate->isError()) {
314
58
        QQmlContext *context = new QQmlContext(qmlContext(listItem));
315
59
        panelItem = qobject_cast<QQuickItem*>(panelDelegate->beginCreate(context));
316
60
        if (!panelItem) {
317
61
            qmlInfo(listItem) << UbuntuI18n::tr("Error creating ListItem actions panel");
318
62
        } else {
319
63
            context->setParent(panelItem);
320
64
            QQml_setParent_noEvent(panelItem, listItem);
321
65
            panelItem->setParentItem(listItem);
322
66
            // create attached property!
323
67
            UCListItemAttached *attached = static_cast<UCListItemAttached*>(
324
68
                        qmlAttachedPropertiesObject<UCListItem>(panelItem));
325
69
            if (!attached->actions()) {
326
70
                attached->setList(listItem, leading, true);
327
71
            } else {
328
72
                // container is set, but we need to emit the signal again so we get the
329
73
                // attached props updated for those cases when the attached property is
330
74
                // created before the statement above
331
75
                Q_EMIT attached->actionsChanged();
332
76
            }
333
77
            panelDelegate->completeCreate();
334
78
        }
335
79
    } else {
336
80
        qmlInfo(listItem) << panelDelegate->errorString();
337
81
    }
338
82
    return panelItem != 0;
339
83
}
340
84
341
85
UCListItemActions *UCActionPanel::actions()
342
86
{
343
87
    return leading ? UCListItemPrivate::get(listItem)->leadingActions :
344
88
                     UCListItemPrivate::get(listItem)->trailingActions;
345
89
}
346
90
347
91
QQuickItem *UCActionPanel::panel() const
348
92
{
349
93
    return panelItem;
350
94
}
351
95
352
96
bool UCActionPanel::grabPanel(UCActionPanel **panel, UCListItem *item, bool leading)
353
97
{
354
98
    if (!(*panel) && item) {
355
99
        UCListItemActions *actions = leading ? UCListItemPrivate::get(item)->leadingActions :
356
100
                                             UCListItemPrivate::get(item)->trailingActions;
357
101
        if (actions) {
358
102
            (*panel) = new UCActionPanel(item, leading);
359
103
            UCListItemPrivate *pItem = UCListItemPrivate::get((*panel)->listItem);
360
104
            pItem->initStyleItem();
361
105
            if (!pItem->styleItem ||
362
106
                    (pItem->styleItem && !(*panel)->createPanel(pItem->styleItem->m_actionsDelegate))) {
363
107
                delete (*panel);
364
108
                (*panel) = 0;
365
109
            }
366
110
        }
367
111
    }
368
112
    if (*panel) {
369
113
        (*panel)->connected = true;
370
114
        (*panel)->status = leading ? UCListItem::Leading : UCListItem::Trailing;
371
115
        Q_EMIT (*panel)->statusChanged();
372
116
    }
373
117
    return (*panel) != 0;
374
118
}
375
119
376
120
void UCActionPanel::ungrabPanel(UCActionPanel *panel)
377
121
{
378
122
    if (!panel || !panel->connected) {
379
123
        return;
380
124
    }
381
125
    panel->connected = false;
382
126
    panel->panelItem->setVisible(false);
383
127
}
384
128
385
129
bool UCActionPanel::isConnected(UCActionPanel *panel)
386
130
{
387
131
    return panel && panel->connected;
388
132
}
389
0
133
390
=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.cpp'
391
--- modules/Ubuntu/Components/plugin/uclistitem.cpp	2015-01-07 06:42:09 +0000
392
+++ modules/Ubuntu/Components/plugin/uclistitem.cpp	2015-01-16 14:53:38 +0000
393
@@ -32,10 +32,6 @@
394
32
#include <QtQuick/private/qquickmousearea_p.h>
32
#include <QtQuick/private/qquickmousearea_p.h>
395
33
#include "uclistitemstyle.h"
33
#include "uclistitemstyle.h"
396
34
34
397
35
#define MIN(x, y)           ((x < y) ? x : y)
398
36
#define MAX(x, y)           ((x > y) ? x : y)
399
37
#define CLAMP(v, min, max)  (min <= max) ? MAX(min, MIN(v, max)) : MAX(max, MIN(v, min))
400
38
401
39
QColor getPaletteColor(const char *profile, const char *color)
35
QColor getPaletteColor(const char *profile, const char *color)
402
40
{
36
{
403
41
    QColor result;
37
    QColor result;
404
@@ -85,6 +81,12 @@
405
85
    if (!snap) {
81
    if (!snap) {
406
86
        // no animation, so we simply position the component
82
        // no animation, so we simply position the component
407
87
        listItem->contentItem->setX(to);
83
        listItem->contentItem->setX(to);
408
84
        // and complete snap logic
409
85
        if (to == 0.0) {
410
86
            snapOut();
411
87
        } else {
412
88
            snapIn();
413
89
        }
414
88
        return false;
90
        return false;
415
89
    }
91
    }
416
90
    snap->setTargetObject(listItem->contentItem);
92
    snap->setTargetObject(listItem->contentItem);
417
@@ -98,14 +100,24 @@
418
98
    if (snap->properties().isEmpty() && snap->property().isEmpty()) {
100
    if (snap->properties().isEmpty() && snap->property().isEmpty()) {
419
99
        snap->setProperty("x");
101
        snap->setProperty("x");
420
100
    }
102
    }
421
103
    // make sure the animation is not running
422
104
    snap->stop();
423
101
    snap->setFrom(listItem->contentItem->property(snap->property().toLocal8Bit().constData()));
105
    snap->setFrom(listItem->contentItem->property(snap->property().toLocal8Bit().constData()));
424
102
    snap->setTo(to);
106
    snap->setTo(to);
426
103
    snap->setAlwaysRunToEnd(true);
107
    snap->setAlwaysRunToEnd(false);
427
104
    listItem->setContentMoving(true);
108
    listItem->setContentMoving(true);
428
105
    snap->start();
109
    snap->start();
429
106
    return true;
110
    return true;
430
107
}
111
}
431
108
112
432
113
void UCListItemSnapAnimator::stop()
433
114
{
434
115
    QQuickPropertyAnimation *snap = getDefaultAnimation();
435
116
    if (snap && snap->isRunning()) {
436
117
        snap->stop();
437
118
    }
438
119
}
439
120
440
109
/*
121
/*
441
110
 * The function completes a running snap animation.
122
 * The function completes a running snap animation.
442
111
 */
123
 */
443
@@ -131,17 +143,19 @@
444
131
        QObject::disconnect(snap, 0, 0, 0);
143
        QObject::disconnect(snap, 0, 0, 0);
445
132
    }
144
    }
446
133
    UCListItemPrivate *listItem = UCListItemPrivate::get(item);
145
    UCListItemPrivate *listItem = UCListItemPrivate::get(item);
448
134
    if (listItem->attachedProperties) {
146
    if (listItem->parentAttached) {
449
135
        // restore flickable's interactive and cleanup
147
        // restore flickable's interactive and cleanup
451
136
        listItem->attachedProperties->disableInteractive(item, false);
148
        listItem->parentAttached->disableInteractive(item, false);
452
137
        // no need to listen flickables any longer
149
        // no need to listen flickables any longer
453
138
        listItem->listenToRebind(false);
150
        listItem->listenToRebind(false);
454
139
    }
151
    }
455
140
    // disconnect actions
152
    // disconnect actions
458
141
    listItem->grabPanel(listItem->leadingActions, false);
153
    UCActionPanel::ungrabPanel(listItem->leadingPanel);
459
142
    listItem->grabPanel(listItem->trailingActions, false);
154
    UCActionPanel::ungrabPanel(listItem->trailingPanel);
460
143
    // set contentMoved to false
155
    // set contentMoved to false
461
144
    listItem->setContentMoving(false);
156
    listItem->setContentMoving(false);
462
157
    // lock contentItem left/right edges
463
158
    listItem->lockContentItem(true);
464
145
}
159
}
465
146
160
466
147
/*
161
/*
467
@@ -176,8 +190,6 @@
468
176
UCListItemDivider::UCListItemDivider(QObject *parent)
190
UCListItemDivider::UCListItemDivider(QObject *parent)
469
177
    : QObject(parent)
191
    : QObject(parent)
470
178
    , m_visible(true)
192
    , m_visible(true)
471
179
    , m_leftMarginChanged(false)
472
180
    , m_rightMarginChanged(false)
473
181
    , m_colorFromChanged(false)
193
    , m_colorFromChanged(false)
474
182
    , m_colorToChanged(false)
194
    , m_colorToChanged(false)
475
183
    , m_thickness(0)
195
    , m_thickness(0)
476
@@ -202,14 +214,9 @@
477
202
214
478
203
void UCListItemDivider::unitsChanged()
215
void UCListItemDivider::unitsChanged()
479
204
{
216
{
487
205
    m_thickness = UCUnits::instance().dp(2);
217
    m_thickness = UCUnits::instance().dp(DIVIDER_THICKNESS_DP);
481
206
    if (!m_leftMarginChanged) {
482
207
        m_leftMargin = UCUnits::instance().dp(2);
483
208
    }
484
209
    if (!m_rightMarginChanged) {
485
210
        m_rightMargin = UCUnits::instance().dp(2);
486
211
    }
488
212
    if (m_listItem) {
218
    if (m_listItem) {
489
219
        m_listItem->adjustContentItemHeight();
490
213
        m_listItem->update();
220
        m_listItem->update();
491
214
    }
221
    }
492
215
}
222
}
493
@@ -273,9 +280,9 @@
494
273
        return;
280
        return;
495
274
    }
281
    }
496
275
    m_visible = visible;
282
    m_visible = visible;
497
276
    m_listItem->resize();
498
277
    m_listItem->update();
499
278
    Q_EMIT visibleChanged();
283
    Q_EMIT visibleChanged();
500
284
    // set/reset contentItem's bottomMargin
501
285
    m_listItem->adjustContentItemHeight();
502
279
}
286
}
503
280
287
504
281
void UCListItemDivider::setLeftMargin(qreal leftMargin)
288
void UCListItemDivider::setLeftMargin(qreal leftMargin)
505
@@ -284,7 +291,6 @@
506
284
        return;
291
        return;
507
285
    }
292
    }
508
286
    m_leftMargin = leftMargin;
293
    m_leftMargin = leftMargin;
509
287
    m_leftMarginChanged = true;
510
288
    m_listItem->update();
294
    m_listItem->update();
511
289
    Q_EMIT leftMarginChanged();
295
    Q_EMIT leftMarginChanged();
512
290
}
296
}
513
@@ -295,7 +301,6 @@
514
295
        return;
301
        return;
515
296
    }
302
    }
516
297
    m_rightMargin = rightMargin;
303
    m_rightMargin = rightMargin;
517
298
    m_rightMarginChanged = true;
518
299
    m_listItem->update();
304
    m_listItem->update();
519
300
    Q_EMIT rightMarginChanged();
305
    Q_EMIT rightMarginChanged();
520
301
}
306
}
521
@@ -329,25 +334,26 @@
522
329
    : UCStyledItemBasePrivate()
334
    : UCStyledItemBasePrivate()
523
330
    , highlighted(false)
335
    , highlighted(false)
524
331
    , contentMoved(false)
336
    , contentMoved(false)
525
332
    , highlightColorChanged(false)
526
333
    , swiped(false)
337
    , swiped(false)
527
334
    , suppressClick(false)
338
    , suppressClick(false)
528
335
    , ready(false)
339
    , ready(false)
529
336
    , customStyle(false)
530
337
    , customColor(false)
340
    , customColor(false)
531
338
    , customOvershoot(false)
341
    , customOvershoot(false)
532
339
    , flicked(false)
342
    , flicked(false)
534
340
    , xAxisMoveThresholdGU(1.5)
343
    , xAxisMoveThresholdGU(DEFAULT_SWIPE_THRESHOLD_GU)
535
341
    , overshoot(0)
344
    , overshoot(0)
536
342
    , color(Qt::transparent)
345
    , color(Qt::transparent)
537
343
    , highlightColor(Qt::transparent)
346
    , highlightColor(Qt::transparent)
539
344
    , attachedProperties(0)
347
    , parentAttached(0)
540
345
    , contentItem(new QQuickItem)
348
    , contentItem(new QQuickItem)
541
346
    , divider(new UCListItemDivider)
349
    , divider(new UCListItemDivider)
542
347
    , leadingActions(0)
350
    , leadingActions(0)
543
348
    , trailingActions(0)
351
    , trailingActions(0)
544
352
    , leadingPanel(0)
545
353
    , trailingPanel(0)
546
349
    , animator(0)
354
    , animator(0)
547
350
    , styleComponent(0)
355
    , styleComponent(0)
548
356
    , implicitStyleComponent(0)
549
351
    , styleItem(0)
357
    , styleItem(0)
550
352
{
358
{
551
353
}
359
}
552
@@ -391,13 +397,17 @@
553
391
397
554
392
void UCListItemPrivate::_q_updateThemedData()
398
void UCListItemPrivate::_q_updateThemedData()
555
393
{
399
{
556
400
    Q_Q(UCListItem);
557
401
    // we reload the implicit style only if the custom style is not set, and
558
402
    // the component is ready
559
403
    if (!styleComponent && ready) {
560
404
        resetStyle();
561
405
    }
562
406
563
394
    // update colors, panels
407
    // update colors, panels
564
395
    if (!customColor) {
408
    if (!customColor) {
568
396
        Q_Q(UCListItem);
409
        q->resetHighlightColor();
566
397
        highlightColor = getPaletteColor("selected", "background");
567
398
        q->update();
569
399
    }
410
    }
570
400
    loadStyle(true);
571
401
}
411
}
572
402
412
573
403
void UCListItemPrivate::_q_rebound()
413
void UCListItemPrivate::_q_rebound()
574
@@ -405,8 +415,8 @@
575
405
    setHighlighted(false);
415
    setHighlighted(false);
576
406
    // initiate rebinding only if there were actions tugged
416
    // initiate rebinding only if there were actions tugged
577
407
    Q_Q(UCListItem);
417
    Q_Q(UCListItem);
580
408
    if (!UCListItemActionsPrivate::isConnectedTo(leadingActions, q) &&
418
    if (!UCActionPanel::isConnected(leadingPanel) &&
581
409
        !UCListItemActionsPrivate::isConnectedTo(trailingActions, q)) {
419
        !UCActionPanel::isConnected(trailingPanel)) {
582
410
        return;
420
        return;
583
411
    }
421
    }
584
412
    setSwiped(false);
422
    setSwiped(false);
585
@@ -430,7 +440,7 @@
586
430
 */
440
 */
587
431
QQmlComponent *UCListItemPrivate::style() const
441
QQmlComponent *UCListItemPrivate::style() const
588
432
{
442
{
590
433
    return styleComponent;
443
    return styleComponent ? styleComponent : implicitStyleComponent;
591
434
}
444
}
592
435
void UCListItemPrivate::setStyle(QQmlComponent *delegate)
445
void UCListItemPrivate::setStyle(QQmlComponent *delegate)
593
436
{
446
{
594
@@ -438,54 +448,89 @@
595
438
        return;
448
        return;
596
439
    }
449
    }
597
440
    Q_Q(UCListItem);
450
    Q_Q(UCListItem);
598
451
    if (!delegate) {
599
452
        // undefined or null delegate resets the style to theme
600
453
        resetStyle();
601
454
        return;
602
455
    }
603
441
    // make sure we're rebound before we change the panel component
456
    // make sure we're rebound before we change the panel component
604
442
    promptRebound();
457
    promptRebound();
605
458
    bool reloadStyle = styleItem != 0;
606
443
    if (styleItem) {
459
    if (styleItem) {
608
444
        delete styleItem;
460
        styleItem->deleteLater();
609
445
        styleItem = 0;
461
        styleItem = 0;
610
446
        Q_EMIT q->__styleInstanceChanged();
462
        Q_EMIT q->__styleInstanceChanged();
611
447
    }
463
    }
612
448
    delete styleComponent;
613
449
    customStyle = (delegate == 0);
614
450
    styleComponent = delegate;
464
    styleComponent = delegate;
616
451
    loadStyle(false);
465
    // delete theme style for now
617
466
    if (implicitStyleComponent) {
618
467
        implicitStyleComponent->deleteLater();
619
468
        implicitStyleComponent = 0;
620
469
    }
621
470
    if (reloadStyle) {
622
471
        initStyleItem();
623
472
    }
624
452
    Q_EMIT q->styleChanged();
473
    Q_EMIT q->styleChanged();
625
453
}
474
}
629
454
475
void UCListItemPrivate::resetStyle()
627
455
// update themed components
628
456
bool UCListItemPrivate::loadStyle(bool reload)
630
457
{
476
{
638
458
    if (!ready) {
477
    if (styleComponent || !implicitStyleComponent) {
639
459
        return false;
478
        styleComponent = 0;
640
460
    }
479
        // rebound as the current panels are not gonna be valid anymore
641
461
    if (!customStyle) {
480
        if (swiped) {
642
462
        Q_Q(UCListItem);
481
            promptRebound();
643
463
        if (reload && styleItem) {
482
        }
644
464
            delete styleItem;
483
        bool reloadStyle = styleItem != 0;
645
484
        if (styleItem) {
646
485
            styleItem->deleteLater();
647
465
            styleItem = 0;
486
            styleItem = 0;
652
466
            Q_EMIT q->__styleInstanceChanged();
487
        }
653
467
        }
488
        delete implicitStyleComponent;
654
468
        delete styleComponent;
489
        Q_Q(UCListItem);
655
469
        styleComponent = UCTheme::instance().createStyleComponent("ListItemStyle.qml", q);
490
        implicitStyleComponent = UCTheme::instance().createStyleComponent("ListItemStyle.qml", q);
656
491
        // set the objectnane for testing in tst_listitems.qml
657
492
        implicitStyleComponent->setObjectName("ListItemThemeStyle");
658
493
        // re-create style instance if it was created using the implicit style
659
494
        if (reloadStyle) {
660
495
            initStyleItem();
661
496
        }
662
497
        Q_EMIT q->styleChanged();
663
470
    }
498
    }
664
471
    return (styleComponent != NULL);
665
472
}
499
}
666
500
667
473
// creates the style item
501
// creates the style item
668
474
void UCListItemPrivate::initStyleItem()
502
void UCListItemPrivate::initStyleItem()
669
475
{
503
{
671
476
    if (!styleItem && !loadStyle(false)) {
504
    if (!ready || styleItem) {
672
477
        return;
505
        return;
673
478
    }
506
    }
674
507
    // get the component the style instance is created from
675
479
    Q_Q(UCListItem);
508
    Q_Q(UCListItem);
677
480
    QObject *object = styleComponent->beginCreate(qmlContext(q));
509
    QQmlComponent *delegate = style();
678
510
    if (!delegate) {
679
511
        // the style is not loaded from the theme yet
680
512
        _q_updateThemedData();
681
513
        delegate = style();
682
514
    }
683
515
    if (!delegate) {
684
516
        return;
685
517
    }
686
518
    if (delegate->isError()) {
687
519
        qmlInfo(q) << delegate->errorString();
688
520
        return;
689
521
    }
690
522
    QQmlContext *context = new QQmlContext(qmlContext(q));
691
523
    QObject *object = delegate->beginCreate(context);
692
481
    styleItem = qobject_cast<UCListItemStyle*>(object);
524
    styleItem = qobject_cast<UCListItemStyle*>(object);
693
482
    if (!styleItem) {
525
    if (!styleItem) {
694
483
        delete object;
526
        delete object;
696
484
        styleComponent->completeCreate();
527
        delegate->completeCreate();
697
528
        delete context;
698
485
        return;
529
        return;
699
486
    }
530
    }
700
531
    context->setParent(styleItem);
701
487
    QQml_setParent_noEvent(styleItem, q);
532
    QQml_setParent_noEvent(styleItem, q);
703
488
    styleComponent->completeCreate();
533
    delegate->completeCreate();
704
489
    Q_EMIT q->__styleInstanceChanged();
534
    Q_EMIT q->__styleInstanceChanged();
705
490
535
706
491
    // get the overshoot value from the style!
536
    // get the overshoot value from the style!
707
@@ -519,8 +564,8 @@
708
519
{
564
{
709
520
    Q_Q(UCListItem);
565
    Q_Q(UCListItem);
710
521
    QQuickItem *owner = flickable ? flickable : parentItem;
566
    QQuickItem *owner = flickable ? flickable : parentItem;
713
522
    q->setImplicitWidth(owner ? owner->width() : UCUnits::instance().gu(40));
567
    q->setImplicitWidth(owner ? owner->width() : UCUnits::instance().gu(IMPLICIT_LISTITEM_WIDTH_GU));
714
523
    q->setImplicitHeight(UCUnits::instance().gu(7));
568
    q->setImplicitHeight(UCUnits::instance().gu(IMPLICIT_LISTITEM_HEIGHT_GU));
715
524
}
569
}
716
525
570
717
526
// returns the index of the list item when used in model driven views,
571
// returns the index of the list item when used in model driven views,
718
@@ -580,40 +625,37 @@
719
580
    }
625
    }
720
581
}
626
}
721
582
627
722
583
// grabs the panels from the leading/trailing actions and disables all ascending flickables
723
584
bool UCListItemPrivate::grabPanel(UCListItemActions *actionsList, bool isTugged)
724
585
{
725
586
    Q_Q(UCListItem);
726
587
    if (isTugged) {
727
588
        bool grab = UCListItemActionsPrivate::connectToListItem(actionsList, q, (actionsList == leadingActions));
728
589
        if (attachedProperties) {
729
590
            attachedProperties->disableInteractive(q, true);
730
591
        }
731
592
        return grab;
732
593
    } else {
733
594
        UCListItemActionsPrivate::disconnectFromListItem(actionsList);
734
595
        return false;
735
596
    }
736
597
}
737
598
738
599
739
600
// connects/disconnects from the Flickable anchestor to get notified when to do rebound
628
// connects/disconnects from the Flickable anchestor to get notified when to do rebound
740
601
void UCListItemPrivate::listenToRebind(bool listen)
629
void UCListItemPrivate::listenToRebind(bool listen)
741
602
{
630
{
743
603
    if (attachedProperties) {
631
    if (parentAttached) {
744
604
        Q_Q(UCListItem);
632
        Q_Q(UCListItem);
757
605
        attachedProperties->listenToRebind(q, listen);
633
        parentAttached->listenToRebind(q, listen);
758
606
    }
634
    }
759
607
}
635
}
760
608
636
761
609
void UCListItemPrivate::resize()
637
// lock/unlock contentItem's left and right anchors to the ListItem's left and right
762
610
{
638
void UCListItemPrivate::lockContentItem(bool lock)
763
611
    Q_Q(UCListItem);
639
{
764
612
    QRectF rect(q->boundingRect());
640
    QQuickAnchors *contentAnchors = QQuickItemPrivate::get(contentItem)->anchors();
765
613
    if (divider && divider->m_visible) {
641
    if (lock) {
766
614
        rect.setHeight(rect.height() - divider->m_thickness);
642
        contentAnchors->setLeft(left());
767
615
    }
643
        contentAnchors->setRight(right());
768
616
    contentItem->setSize(rect.size());
644
    } else {
769
645
        contentAnchors->resetLeft();
770
646
        contentAnchors->resetRight();
771
647
    }
772
648
}
773
649
774
650
// adjust contentItem height depending on teh divider's visibility
775
651
void UCListItemPrivate::adjustContentItemHeight()
776
652
{
777
653
    QQuickAnchors *contentAnchors = QQuickItemPrivate::get(contentItem)->anchors();
778
654
    if (divider->m_visible) {
779
655
        contentAnchors->setBottomMargin(divider->m_thickness);
780
656
    } else {
781
657
        contentAnchors->resetBottomMargin();
782
658
    }
783
617
}
659
}
784
618
660
785
619
void UCListItemPrivate::update()
661
void UCListItemPrivate::update()
786
@@ -628,13 +670,13 @@
787
628
// clamps the X value and moves the contentItem to the new X value
670
// clamps the X value and moves the contentItem to the new X value
788
629
void UCListItemPrivate::clampAndMoveX(qreal &x, qreal dx)
671
void UCListItemPrivate::clampAndMoveX(qreal &x, qreal dx)
789
630
{
672
{
790
631
    UCListItemActionsPrivate *leading = UCListItemActionsPrivate::get(leadingActions);
791
632
    UCListItemActionsPrivate *trailing = UCListItemActionsPrivate::get(trailingActions);
792
633
    x += dx;
673
    x += dx;
793
634
    // min cannot be less than the trailing's panel width
674
    // min cannot be less than the trailing's panel width
795
635
    qreal min = (trailing && trailing->panelItem) ? -trailing->panelItem->width() - overshoot: 0;
675
    QQuickItem *leadingPanelItem = leadingPanel ? leadingPanel->panel() : 0;
796
676
    QQuickItem *trailingPanelItem = trailingPanel ? trailingPanel->panel() : 0;
797
677
    qreal min = (trailingPanelItem) ? -trailingPanelItem->width() - overshoot: 0;
798
636
    // max cannot be bigger than 0 or the leading's width in case we have leading panel
678
    // max cannot be bigger than 0 or the leading's width in case we have leading panel
800
637
    qreal max = (leading && leading->panelItem) ? leading->panelItem->width() + overshoot: 0;
679
    qreal max = (leadingPanelItem) ? leadingPanelItem->width() + overshoot: 0;
801
638
    x = CLAMP(x, min, max);
680
    x = CLAMP(x, min, max);
802
639
}
681
}
803
640
682
804
@@ -722,11 +764,14 @@
805
722
 * When used in \c ListView or \l UbuntuListView, the last list item will not
764
 * When used in \c ListView or \l UbuntuListView, the last list item will not
806
723
 * show the divider no matter of the visible property value set.
765
 * show the divider no matter of the visible property value set.
807
724
 *
766
 *
809
725
 * ListItem can handle actions that can get tugged from front to back of the item.
767
 * ListItem can handle actions that can get swiped from front to back of the item.
810
726
 * These actions are Action elements visualized in panels attached to the front
768
 * These actions are Action elements visualized in panels attached to the front
811
727
 * or to the back of the item, and are revealed by swiping the item horizontally.
769
 * or to the back of the item, and are revealed by swiping the item horizontally.
814
728
 * The tug is started only after the mouse/touch move had passed a given threshold.
770
 * The swipe is started only after the mouse/touch move had passed a given threshold.
815
729
 * These actions are configured through the \l leadingActions as well as \l
771
 * The actions are visualized by a panel, which is configurable through the \l
816
772
 * ListItemStyle::actionsDelegate style property.
817
773
 *
818
774
 * The actions are configured through the \l leadingActions as well as \l
819
730
 * trailingActions properties.
775
 * trailingActions properties.
820
731
 * \qml
776
 * \qml
821
732
 * ListItem {
777
 * ListItem {
822
@@ -751,13 +796,11 @@
823
751
 *     }
796
 *     }
824
752
 * }
797
 * }
825
753
 * \endqml
798
 * \endqml
833
754
 * \note When a list item is tugged, it automatically connects both leading and
799
 * \note When a list item is swiped, it automatically connects both leading and
834
755
 * trailing actions to the list item. This implies that a ListItem cannot use
800
 * trailing actions to the list item. If needed, the same ListItemActions instance
835
756
 * the same ListItemActions instance for both leading and trailing actions. If
801
 * can be used in both leading and trailing side. In the following example the
836
757
 * it is desired to have the same action present in both leading and trailing
802
 * list item can be deleted through both leading and trailing actions using the
837
758
 * actions, one of the ListItemActions actions list can use the other's list. In
803
 * same container:
831
759
 * the following example the list item can be deleted through both leading and
832
760
 * trailing actions:
838
761
 * \qml
804
 * \qml
839
762
 * ListItem {
805
 * ListItem {
840
763
 *     id: listItem
806
 *     id: listItem
841
@@ -769,13 +812,15 @@
842
769
 *             }
812
 *             }
843
770
 *         ]
813
 *         ]
844
771
 *     }
814
 *     }
848
772
 *     trailingActions: ListItemActions {
815
 *     trailingActions: leadingActions
846
773
 *         actions: leadingActions.actions
847
774
 *     }
849
775
 * }
816
 * }
850
776
 * \endqml
817
 * \endqml
851
818
 * The action is triggered only after all the animations are completed.
852
777
 * \sa ListItemActions
819
 * \sa ListItemActions
853
778
 *
820
 *
854
821
 * ListItem provides a set of attached properties which are attached to each panel
855
822
 * of the ListItem. However not all properties are valid in all the circumstances.
856
823
 *
857
779
 * The component is styled using the \l ListItemStyle style interface.
824
 * The component is styled using the \l ListItemStyle style interface.
858
780
 */
825
 */
859
781
826
860
@@ -799,13 +844,37 @@
861
799
844
862
800
UCListItemAttached *UCListItem::qmlAttachedProperties(QObject *owner)
845
UCListItemAttached *UCListItem::qmlAttachedProperties(QObject *owner)
863
801
{
846
{
865
802
    return new UCListItemAttached(owner);
847
    /*
866
848
     * Detect the attachee, whether is it a child item of the panelItem. The panelItem
867
849
     * itself cannot be detected, as the object can be attached during the call of
868
850
     * component.beginCreate().
869
851
     */
870
852
    UCListItemAttached *attached = new UCListItemAttached(owner);
871
853
    QQuickItem *item = qobject_cast<QQuickItem*>(owner);
872
854
    while (item) {
873
855
        // has item our attached property?
874
856
        UCListItemAttached *itemAttached = static_cast<UCListItemAttached*>(
875
857
                    qmlAttachedPropertiesObject<UCListItem>(item, false));
876
858
        if (itemAttached) {
877
859
            attached->connectToAttached(itemAttached);
878
860
            break;
879
861
        }
880
862
        item = item->parentItem();
881
863
    }
882
864
    return attached;
883
803
}
865
}
884
804
866
885
805
void UCListItem::componentComplete()
867
void UCListItem::componentComplete()
886
806
{
868
{
887
807
    UCStyledItemBase::componentComplete();
869
    UCStyledItemBase::componentComplete();
888
808
    Q_D(UCListItem);
870
    Q_D(UCListItem);
889
871
    // anchor contentItem prior doing anything else
890
872
    QQuickAnchors *contentAnchors = QQuickItemPrivate::get(d->contentItem)->anchors();
891
873
    contentAnchors->setTop(d->top());
892
874
    contentAnchors->setBottom(d->bottom());
893
875
    d->adjustContentItemHeight();
894
876
    d->lockContentItem(true);
895
877
896
809
    d->ready = true;
878
    d->ready = true;
897
810
    /* We only deal with ListView, as for other cases we would need to check the children
879
    /* We only deal with ListView, as for other cases we would need to check the children
898
811
     * changes, which would have an enormous impact on performance in case of huge amount
880
     * changes, which would have an enormous impact on performance in case of huge amount
899
@@ -838,21 +907,23 @@
900
838
            d->flickable = qobject_cast<QQuickFlickable*>(data.item->parentItem());
907
            d->flickable = qobject_cast<QQuickFlickable*>(data.item->parentItem());
901
839
        }
908
        }
902
840
909
907
841
        // attach ListItem properties to the flickable or to the parent item
910
        // attach ViewItems to parent item or to ListView
908
842
        if (d->flickable) {
911
        QQuickItem *parentAttachee = data.item;
909
843
            // connect to flickable to get width changes
912
        if (d->flickable && d->flickable->inherits("QQuickListView")) {
910
844
            d->attachedProperties = static_cast<UCListItemAttached*>(qmlAttachedPropertiesObject<UCListItem>(d->flickable));
913
            // attach to ListView
911
914
            d->parentAttached = static_cast<UCViewItemsAttached*>(qmlAttachedPropertiesObject<UCViewItemsAttached>(d->flickable));
912
915
            parentAttachee = d->flickable;
913
845
        } else if (data.item) {
916
        } else if (data.item) {
915
846
            d->attachedProperties = static_cast<UCListItemAttached*>(qmlAttachedPropertiesObject<UCListItem>(data.item));
917
            d->parentAttached = static_cast<UCViewItemsAttached*>(qmlAttachedPropertiesObject<UCViewItemsAttached>(data.item));
916
847
        } else {
918
        } else {
917
848
            // mark as not ready, so no action should be performed which depends on readyness
919
            // mark as not ready, so no action should be performed which depends on readyness
918
849
            d->ready = false;
920
            d->ready = false;
919
850
            // about to be deleted or reparented, disable attached
921
            // about to be deleted or reparented, disable attached
921
851
            d->attachedProperties = 0;
922
            d->parentAttached = 0;
922
852
        }
923
        }
923
853
924
926
854
        if (data.item) {
925
        if (parentAttachee) {
927
855
            QObject::connect(d->flickable ? d->flickable : data.item, SIGNAL(widthChanged()), this, SLOT(_q_updateSize()));
926
            QObject::connect(parentAttachee, SIGNAL(widthChanged()), this, SLOT(_q_updateSize()), Qt::DirectConnection);
928
856
        }
927
        }
929
857
928
930
858
        // update size
929
        // update size
931
@@ -860,14 +931,6 @@
932
860
    }
931
    }
933
861
}
932
}
934
862
933
935
863
void UCListItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
936
864
{
937
865
    UCStyledItemBase::geometryChanged(newGeometry, oldGeometry);
938
866
    // resize contentItem item
939
867
    Q_D(UCListItem);
940
868
    d->resize();
941
869
}
942
870
943
871
QSGNode *UCListItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data)
934
QSGNode *UCListItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data)
944
872
{
935
{
945
873
    Q_UNUSED(data);
936
    Q_UNUSED(data);
946
@@ -924,19 +987,26 @@
947
924
{
987
{
948
925
    UCStyledItemBase::mousePressEvent(event);
988
    UCStyledItemBase::mousePressEvent(event);
949
926
    Q_D(UCListItem);
989
    Q_D(UCListItem);
951
927
    if (d->attachedProperties && d->attachedProperties->isMoving()) {
990
    if (d->parentAttached && d->parentAttached->isMoving()) {
952
928
        // while moving, we cannot select any items
991
        // while moving, we cannot select any items
953
929
        return;
992
        return;
954
930
    }
993
    }
955
931
    if (event->button() == Qt::LeftButton && d->canHighlight(event)) {
994
    if (event->button() == Qt::LeftButton && d->canHighlight(event)) {
956
995
        // stop any ongoing animation!
957
996
        if (d->animator) {
958
997
            d->animator->stop();
959
998
        }
960
932
        d->setHighlighted(true);
999
        d->setHighlighted(true);
961
933
        d->lastPos = d->pressedPos = event->localPos();
1000
        d->lastPos = d->pressedPos = event->localPos();
962
934
        // connect the Flickable to know when to rebound
1001
        // connect the Flickable to know when to rebound
963
935
        d->listenToRebind(true);
1002
        d->listenToRebind(true);
964
936
        // if it was moved, grab the panels
1003
        // if it was moved, grab the panels
965
937
        if (d->swiped) {
1004
        if (d->swiped) {
968
938
            d->grabPanel(d->leadingActions, true);
1005
            UCActionPanel::grabPanel(&d->leadingPanel, this, true);
969
939
            d->grabPanel(d->trailingActions, true);
1006
            UCActionPanel::grabPanel(&d->trailingPanel, this, false);
970
1007
            if (d->parentAttached) {
971
1008
                d->parentAttached->disableInteractive(this, true);
972
1009
            }
973
940
        }
1010
        }
974
941
    }
1011
    }
975
942
    // accept the event so we get the rest of the events as well
1012
    // accept the event so we get the rest of the events as well
976
@@ -950,8 +1020,8 @@
977
950
    // set released
1020
    // set released
978
951
    if (d->highlighted) {
1021
    if (d->highlighted) {
979
952
        d->listenToRebind(false);
1022
        d->listenToRebind(false);
982
953
        if (d->attachedProperties) {
1023
        if (d->parentAttached) {
983
954
            d->attachedProperties->disableInteractive(this, false);
1024
            d->parentAttached->disableInteractive(this, false);
984
955
        }
1025
        }
985
956
1026
986
957
        if (!d->suppressClick) {
1027
        if (!d->suppressClick) {
987
@@ -968,8 +1038,8 @@
988
968
    UCStyledItemBase::mouseMoveEvent(event);
1038
    UCStyledItemBase::mouseMoveEvent(event);
989
969
1039
990
970
    // accept the tugging only if the move is within the threshold
1040
    // accept the tugging only if the move is within the threshold
993
971
    bool leadingAttached = UCListItemActionsPrivate::isConnectedTo(d->leadingActions, this);
1041
    bool leadingAttached = UCActionPanel::isConnected(d->leadingPanel);
994
972
    bool trailingAttached = UCListItemActionsPrivate::isConnectedTo(d->trailingActions, this);
1042
    bool trailingAttached = UCActionPanel::isConnected(d->trailingPanel);
995
973
    if (d->highlighted && !(leadingAttached || trailingAttached)) {
1043
    if (d->highlighted && !(leadingAttached || trailingAttached)) {
996
974
        // check if we can initiate the drag at all
1044
        // check if we can initiate the drag at all
997
975
        // only X direction matters, if Y-direction leaves the threshold, but X not, the tug is not valid
1045
        // only X direction matters, if Y-direction leaves the threshold, but X not, the tug is not valid
998
@@ -984,8 +1054,13 @@
999
984
            // got connected ad which not; this may fail in case of shared ListItemActions,
1054
            // got connected ad which not; this may fail in case of shared ListItemActions,
1000
985
            // as then the panel is shared between the list items, and the panel might be
1055
            // as then the panel is shared between the list items, and the panel might be
1001
986
            // still in use in other panels. See UCListItemActionsPrivate::connectToListItem
1056
            // still in use in other panels. See UCListItemActionsPrivate::connectToListItem
1004
987
            leadingAttached = d->grabPanel(d->leadingActions, true);
1057
            leadingAttached = UCActionPanel::grabPanel(&d->leadingPanel, this, true);
1005
988
            trailingAttached = d->grabPanel(d->trailingActions, true);
1058
            trailingAttached = UCActionPanel::grabPanel(&d->trailingPanel, this, false);
1006
1059
            // unlock contentItem's left/right edges
1007
1060
            d->lockContentItem(false);
1008
1061
            if (d->parentAttached) {
1009
1062
                d->parentAttached->disableInteractive(this, true);
1010
1063
            }
1011
989
            // create animator if not created yet
1064
            // create animator if not created yet
1012
990
            if (!d->animator) {
1065
            if (!d->animator) {
1013
991
                d->animator = new UCListItemSnapAnimator(this);
1066
                d->animator = new UCListItemSnapAnimator(this);
1014
@@ -1007,19 +1082,19 @@
1015
1007
            d->contentItem->setX(x);
1082
            d->contentItem->setX(x);
1016
1008
            // decide which panel is visible by checking the contentItem's X coordinates
1083
            // decide which panel is visible by checking the contentItem's X coordinates
1017
1009
            if (d->contentItem->x() > 0) {
1084
            if (d->contentItem->x() > 0) {
1020
1010
                if (leadingAttached) {
1085
                if (d->leadingPanel) {
1021
1011
                    UCListItemActionsPrivate::get(d->leadingActions)->panelItem->setVisible(true);
1086
                    d->leadingPanel->panel()->setVisible(true);
1022
1012
                }
1087
                }
1025
1013
                if (trailingAttached) {
1088
                if (d->trailingPanel) {
1026
1014
                    UCListItemActionsPrivate::get(d->trailingActions)->panelItem->setVisible(false);
1089
                    d->trailingPanel->panel()->setVisible(false);
1027
1015
                }
1090
                }
1028
1016
            } else if (d->contentItem->x() < 0) {
1091
            } else if (d->contentItem->x() < 0) {
1029
1017
                // trailing revealed
1092
                // trailing revealed
1032
1018
                if (leadingAttached) {
1093
                if (d->leadingPanel) {
1033
1019
                    UCListItemActionsPrivate::get(d->leadingActions)->panelItem->setVisible(false);
1094
                    d->leadingPanel->panel()->setVisible(false);
1034
1020
                }
1095
                }
1037
1021
                if (trailingAttached) {
1096
                if (d->trailingPanel) {
1038
1022
                    UCListItemActionsPrivate::get(d->trailingActions)->panelItem->setVisible(true);
1097
                    d->trailingPanel->panel()->setVisible(true);
1039
1023
                }
1098
                }
1040
1024
            }
1099
            }
1041
1025
        }
1100
        }
1042
@@ -1093,16 +1168,10 @@
1043
1093
    }
1168
    }
1044
1094
    // snap out before we change the actions
1169
    // snap out before we change the actions
1045
1095
    d->promptRebound();
1170
    d->promptRebound();
1052
1096
    // then delete panelItem
1171
    // then delete panel
1053
1097
    if (d->leadingActions) {
1172
    delete d->leadingPanel;
1054
1098
        UCListItemActionsPrivate *list = UCListItemActionsPrivate::get(d->leadingActions);
1173
    d->leadingPanel = 0;
1049
1099
        delete list->panelItem;
1050
1100
        list->panelItem = 0;
1051
1101
    }
1055
1102
    d->leadingActions = actions;
1174
    d->leadingActions = actions;
1056
1103
    if (d->leadingActions == d->trailingActions && d->leadingActions) {
1057
1104
        qmlInfo(this) << UbuntuI18n::tr("leadingActions and trailingActions cannot share the same object!");
1058
1105
    }
1059
1106
    Q_EMIT leadingActionsChanged();
1175
    Q_EMIT leadingActionsChanged();
1060
1107
}
1176
}
1061
1108
1177
1062
@@ -1127,16 +1196,10 @@
1063
1127
    }
1196
    }
1064
1128
    // snap out before we change the actions
1197
    // snap out before we change the actions
1065
1129
    d->promptRebound();
1198
    d->promptRebound();
1072
1130
    // then delete panelItem
1199
    // then delete panel
1073
1131
    if (d->trailingActions) {
1200
    delete d->trailingPanel;
1074
1132
        UCListItemActionsPrivate *list = UCListItemActionsPrivate::get(d->trailingActions);
1201
    d->trailingPanel = 0;
1069
1133
        delete list->panelItem;
1070
1134
        list->panelItem = 0;
1071
1135
    }
1075
1136
    d->trailingActions = actions;
1202
    d->trailingActions = actions;
1076
1137
    if (d->leadingActions == d->trailingActions && d->trailingActions) {
1077
1138
        qmlInfo(this) << UbuntuI18n::tr("leadingActions and trailingActions cannot share the same object!");
1078
1139
    }
1079
1140
    Q_EMIT trailingActionsChanged();
1203
    Q_EMIT trailingActionsChanged();
1080
1141
}
1204
}
1081
1142
1205
1082
@@ -1171,8 +1234,8 @@
1083
1171
 * The default values for the properties are:
1234
 * The default values for the properties are:
1084
1172
 * \list
1235
 * \list
1085
1173
 * \li \c visible: true
1236
 * \li \c visible: true
1088
1174
 * \li \c leftMargin: 2 GU
1237
 * \li \c leftMargin: 0
1089
1175
 * \li \c rightMargin: 2 GU
1238
 * \li \c rightMargin: 0
1090
1176
 * \endlist
1239
 * \endlist
1091
1177
 */
1240
 */
1092
1178
UCListItemDivider* UCListItem::divider() const
1241
UCListItemDivider* UCListItem::divider() const
1093
@@ -1253,7 +1316,8 @@
1094
1253
1316
1095
1254
/*!
1317
/*!
1096
1255
 * \qmlproperty color ListItem::highlightColor
1318
 * \qmlproperty color ListItem::highlightColor
1098
1256
 * Configures the color when highlighted. Defaults to the theme palette's background color.
1319
 * Configures the color when highlighted. Defaults to the theme palette's background
1099
1320
 * color. If changed, it can be reset by assigning undefined as value.
1100
1257
 */
1321
 */
1101
1258
QColor UCListItem::highlightColor() const
1322
QColor UCListItem::highlightColor() const
1102
1259
{
1323
{
1103
@@ -1263,12 +1327,20 @@
1104
1263
void UCListItem::setHighlightColor(const QColor &color)
1327
void UCListItem::setHighlightColor(const QColor &color)
1105
1264
{
1328
{
1106
1265
    Q_D(UCListItem);
1329
    Q_D(UCListItem);
1107
1330
    // mark it as custom even if the value is the same as the previous one
1108
1331
    d->customColor = true;
1109
1266
    if (d->highlightColor == color) {
1332
    if (d->highlightColor == color) {
1110
1267
        return;
1333
        return;
1111
1268
    }
1334
    }
1112
1269
    d->highlightColor = color;
1335
    d->highlightColor = color;
1115
1270
    // no more theme change watch
1336
    update();
1116
1271
    d->customColor = true;
1337
    Q_EMIT highlightColorChanged();
1117
1338
}
1118
1339
void UCListItem::resetHighlightColor()
1119
1340
{
1120
1341
    Q_D(UCListItem);
1121
1342
    d->customColor = false;
1122
1343
    d->highlightColor = getPaletteColor("selected", "background");
1123
1272
    update();
1344
    update();
1124
1273
    Q_EMIT highlightColorChanged();
1345
    Q_EMIT highlightColorChanged();
1125
1274
}
1346
}
1126
@@ -1277,7 +1349,7 @@
1127
1277
 * \qmlproperty real ListItem::swipeOvershoot
1349
 * \qmlproperty real ListItem::swipeOvershoot
1128
1278
 * The property configures the overshoot value on swiping. Its default value is
1350
 * The property configures the overshoot value on swiping. Its default value is
1129
1279
 * configured by the \l {ListItemStyle}{style}. Any positive value overrides the
1351
 * configured by the \l {ListItemStyle}{style}. Any positive value overrides the
1131
1280
 * default value, and any negative value resets it back to the default.
1352
 * default value, and any negative or undefined value resets it back to the default.
1132
1281
 */
1353
 */
1133
1282
qreal UCListItemPrivate::swipeOvershoot() const
1354
qreal UCListItemPrivate::swipeOvershoot() const
1134
1283
{
1355
{
1135
@@ -1285,16 +1357,26 @@
1136
1285
}
1357
}
1137
1286
void UCListItemPrivate::setSwipeOvershoot(qreal overshoot)
1358
void UCListItemPrivate::setSwipeOvershoot(qreal overshoot)
1138
1287
{
1359
{
1139
1360
    // mark any positive value as custom even if it is the same as the previous one
1140
1361
    customOvershoot = (overshoot >= 0.0);
1141
1288
    // same value should be guarded only if the style hasn't been loaded yet
1362
    // same value should be guarded only if the style hasn't been loaded yet
1142
1289
    // swipeOvershoot can be set to 0 prior the style is loaded.
1363
    // swipeOvershoot can be set to 0 prior the style is loaded.
1143
1290
    if (this->overshoot == overshoot && styleItem) {
1364
    if (this->overshoot == overshoot && styleItem) {
1144
1291
        return;
1365
        return;
1145
1292
    }
1366
    }
1151
1293
    customOvershoot = (overshoot >= 0.0);
1367
    if (!customOvershoot) {
1152
1294
    this->overshoot = (overshoot < 0.0) ?
1368
        resetSwipeOvershoot();
1153
1295
                // reset, use style to get the overshoot value
1369
        return;
1154
1296
                (styleItem ? styleItem->m_swipeOvershoot : 0.0) :
1370
    }
1155
1297
                overshoot;
1371
    this->overshoot = overshoot;
1156
1372
    update();
1157
1373
    Q_Q(UCListItem);
1158
1374
    Q_EMIT q->swipeOvershootChanged();
1159
1375
}
1160
1376
void UCListItemPrivate::resetSwipeOvershoot()
1161
1377
{
1162
1378
    customOvershoot = false;
1163
1379
    overshoot = styleItem ? styleItem->m_swipeOvershoot : 0.0;
1164
1298
    update();
1380
    update();
1165
1299
    Q_Q(UCListItem);
1381
    Q_Q(UCListItem);
1166
1300
    Q_EMIT q->swipeOvershootChanged();
1382
    Q_EMIT q->swipeOvershootChanged();
1167
1301
1383
1168
=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.h'
1169
--- modules/Ubuntu/Components/plugin/uclistitem.h	2014-12-18 10:08:56 +0000
1170
+++ modules/Ubuntu/Components/plugin/uclistitem.h	2015-01-16 14:53:38 +0000
1171
@@ -34,17 +34,23 @@
1172
34
    Q_PROPERTY(UCListItemActions *leadingActions READ leadingActions WRITE setLeadingActions NOTIFY leadingActionsChanged DESIGNABLE false)
34
    Q_PROPERTY(UCListItemActions *leadingActions READ leadingActions WRITE setLeadingActions NOTIFY leadingActionsChanged DESIGNABLE false)
1173
35
    Q_PROPERTY(UCListItemActions *trailingActions READ trailingActions WRITE setTrailingActions NOTIFY trailingActionsChanged DESIGNABLE false)
35
    Q_PROPERTY(UCListItemActions *trailingActions READ trailingActions WRITE setTrailingActions NOTIFY trailingActionsChanged DESIGNABLE false)
1174
36
    Q_PROPERTY(bool highlighted READ highlighted NOTIFY highlightedChanged)
36
    Q_PROPERTY(bool highlighted READ highlighted NOTIFY highlightedChanged)
1176
37
    Q_PRIVATE_PROPERTY(UCListItem::d_func(), qreal swipeOvershoot READ swipeOvershoot WRITE setSwipeOvershoot NOTIFY swipeOvershootChanged)
37
    Q_PRIVATE_PROPERTY(UCListItem::d_func(), qreal swipeOvershoot READ swipeOvershoot WRITE setSwipeOvershoot RESET resetSwipeOvershoot NOTIFY swipeOvershootChanged)
1177
38
    Q_PRIVATE_PROPERTY(UCListItem::d_func(), bool contentMoving READ contentMoving NOTIFY contentMovingChanged)
38
    Q_PRIVATE_PROPERTY(UCListItem::d_func(), bool contentMoving READ contentMoving NOTIFY contentMovingChanged)
1178
39
    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
39
    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
1180
40
    Q_PROPERTY(QColor highlightColor READ highlightColor WRITE setHighlightColor NOTIFY highlightColorChanged)
40
    Q_PROPERTY(QColor highlightColor READ highlightColor WRITE setHighlightColor RESET resetHighlightColor NOTIFY highlightColorChanged)
1181
41
    Q_PRIVATE_PROPERTY(UCListItem::d_func(), QQmlListProperty<QObject> listItemData READ data DESIGNABLE false)
41
    Q_PRIVATE_PROPERTY(UCListItem::d_func(), QQmlListProperty<QObject> listItemData READ data DESIGNABLE false)
1182
42
    Q_PRIVATE_PROPERTY(UCListItem::d_func(), QQmlListProperty<QQuickItem> listItemChildren READ children NOTIFY listItemChildrenChanged DESIGNABLE false)
42
    Q_PRIVATE_PROPERTY(UCListItem::d_func(), QQmlListProperty<QQuickItem> listItemChildren READ children NOTIFY listItemChildrenChanged DESIGNABLE false)
1183
43
    // FIXME move these to StyledItemBase with subtheming
43
    // FIXME move these to StyledItemBase with subtheming
1185
44
    Q_PRIVATE_PROPERTY(UCListItem::d_func(), QQmlComponent *style READ style WRITE setStyle NOTIFY styleChanged)
44
    Q_PRIVATE_PROPERTY(UCListItem::d_func(), QQmlComponent *style READ style WRITE setStyle RESET resetStyle NOTIFY styleChanged)
1186
45
    Q_PRIVATE_PROPERTY(UCListItem::d_func(), QQuickItem *__styleInstance READ styleInstance NOTIFY __styleInstanceChanged)
45
    Q_PRIVATE_PROPERTY(UCListItem::d_func(), QQuickItem *__styleInstance READ styleInstance NOTIFY __styleInstanceChanged)
1187
46
    Q_CLASSINFO("DefaultProperty", "listItemData")
46
    Q_CLASSINFO("DefaultProperty", "listItemData")
1188
47
    Q_ENUMS(PanelStatus)
1189
47
public:
48
public:
1190
49
    enum PanelStatus {
1191
50
        None,
1192
51
        Leading,
1193
52
        Trailing
1194
53
    };
1195
48
    explicit UCListItem(QQuickItem *parent = 0);
54
    explicit UCListItem(QQuickItem *parent = 0);
1196
49
    ~UCListItem();
55
    ~UCListItem();
1197
50
56
1198
@@ -61,12 +67,12 @@
1199
61
    void setColor(const QColor &color);
67
    void setColor(const QColor &color);
1200
62
    QColor highlightColor() const;
68
    QColor highlightColor() const;
1201
63
    void setHighlightColor(const QColor &color);
69
    void setHighlightColor(const QColor &color);
1202
70
    void resetHighlightColor();
1203
64
71
1204
65
protected:
72
protected:
1205
66
    void componentComplete();
73
    void componentComplete();
1206
67
    QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data);
74
    QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data);
1207
68
    void itemChange(ItemChange change, const ItemChangeData &data);
75
    void itemChange(ItemChange change, const ItemChangeData &data);
1208
69
    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
1209
70
    void mousePressEvent(QMouseEvent *event);
76
    void mousePressEvent(QMouseEvent *event);
1210
71
    void mouseReleaseEvent(QMouseEvent *event);
77
    void mouseReleaseEvent(QMouseEvent *event);
1211
72
    void mouseMoveEvent(QMouseEvent *event);
78
    void mouseMoveEvent(QMouseEvent *event);
1212
@@ -103,13 +109,57 @@
1213
103
109
1214
104
QML_DECLARE_TYPEINFO(UCListItem, QML_HAS_ATTACHED_PROPERTIES)
110
QML_DECLARE_TYPEINFO(UCListItem, QML_HAS_ATTACHED_PROPERTIES)
1215
105
111
1216
112
class UCAction;
1217
113
class UCListItemActions;
1218
106
class UCListItemAttachedPrivate;
114
class UCListItemAttachedPrivate;
1219
107
class UCListItemAttached : public QObject
115
class UCListItemAttached : public QObject
1220
108
{
116
{
1221
109
    Q_OBJECT
117
    Q_OBJECT
1222
118
    Q_PROPERTY(UCListItemActions *actions READ actions NOTIFY actionsChanged)
1223
119
    Q_PROPERTY(QQmlListProperty<UCAction> visibleActions READ visibleActions NOTIFY visibleActionsChanged)
1224
120
    Q_PROPERTY(UCListItem *item READ item NOTIFY itemChanged)
1225
121
    Q_PROPERTY(int index READ index NOTIFY indexChanged)
1226
122
    Q_PROPERTY(UCListItem::PanelStatus panelStatus READ panelStatus NOTIFY panelStatusChanged)
1227
110
public:
123
public:
1229
111
    explicit UCListItemAttached(QObject *owner);
124
    UCListItemAttached(QObject *parent = 0);
1230
112
    ~UCListItemAttached();
125
    ~UCListItemAttached();
1231
126
    void setList(UCListItem *list, bool leading, bool visualizeActions);
1232
127
    void connectToAttached(UCListItemAttached *parentAttached);
1233
128
1234
129
    UCListItemActions *actions() const;
1235
130
    QQmlListProperty<UCAction> visibleActions();
1236
131
    UCListItem *item();
1237
132
    int index();
1238
133
    UCListItem::PanelStatus panelStatus();
1239
134
1240
135
public Q_SLOTS:
1241
136
    void snapToPosition(qreal position);
1242
137
1243
138
Q_SIGNALS:
1244
139
    void actionsChanged();
1245
140
    void visibleActionsChanged();
1246
141
    void itemChanged();
1247
142
    void indexChanged();
1248
143
    void panelStatusChanged();
1249
144
1250
145
private:
1251
146
    Q_DECLARE_PRIVATE(UCListItemAttached)
1252
147
    friend class UCListItemAction;
1253
148
1254
149
private Q_SLOTS:
1255
150
    void updateVisibleActions();
1256
151
};
1257
152
1258
153
1259
154
class UCViewItemsAttachedPrivate;
1260
155
class UCViewItemsAttached : public QObject
1261
156
{
1262
157
    Q_OBJECT
1263
158
public:
1264
159
    explicit UCViewItemsAttached(QObject *owner);
1265
160
    ~UCViewItemsAttached();
1266
161
1267
162
    static UCViewItemsAttached *qmlAttachedProperties(QObject *owner);
1268
113
163
1269
114
    bool listenToRebind(UCListItem *item, bool listen);
164
    bool listenToRebind(UCListItem *item, bool listen);
1270
115
    void disableInteractive(UCListItem *item, bool disable);
165
    void disableInteractive(UCListItem *item, bool disable);
1271
@@ -119,8 +169,9 @@
1272
119
private Q_SLOTS:
169
private Q_SLOTS:
1273
120
    void unbindItem();
170
    void unbindItem();
1274
121
private:
171
private:
1277
122
    Q_DECLARE_PRIVATE(UCListItemAttached)
172
    Q_DECLARE_PRIVATE(UCViewItemsAttached)
1278
123
    QScopedPointer<UCListItemAttachedPrivate> d_ptr;
173
    QScopedPointer<UCViewItemsAttachedPrivate> d_ptr;
1279
124
};
174
};
1280
175
QML_DECLARE_TYPEINFO(UCViewItemsAttached, QML_HAS_ATTACHED_PROPERTIES)
1281
125
176
1282
126
#endif // UCLISTITEM_H
177
#endif // UCLISTITEM_H
1283
127
178
1284
=== modified file 'modules/Ubuntu/Components/plugin/uclistitem_p.h'
1285
--- modules/Ubuntu/Components/plugin/uclistitem_p.h	2015-01-07 06:42:09 +0000
1286
+++ modules/Ubuntu/Components/plugin/uclistitem_p.h	2015-01-16 14:53:38 +0000
1287
@@ -22,6 +22,15 @@
1288
22
#include <QtCore/QPointer>
22
#include <QtCore/QPointer>
1289
23
#include <QtQuick/private/qquickrectangle_p.h>
23
#include <QtQuick/private/qquickrectangle_p.h>
1290
24
24
1291
25
#define MIN(x, y)           ((x < y) ? x : y)
1292
26
#define MAX(x, y)           ((x > y) ? x : y)
1293
27
#define CLAMP(v, min, max)  (min <= max) ? MAX(min, MIN(v, max)) : MAX(max, MIN(v, min))
1294
28
1295
29
#define IMPLICIT_LISTITEM_WIDTH_GU      40
1296
30
#define IMPLICIT_LISTITEM_HEIGHT_GU     7
1297
31
#define DIVIDER_THICKNESS_DP            2
1298
32
#define DEFAULT_SWIPE_THRESHOLD_GU      1.5
1299
33
1300
25
class QQuickFlickable;
34
class QQuickFlickable;
1301
26
class QQuickPropertyAnimation;
35
class QQuickPropertyAnimation;
1302
27
class UCListItemContent;
36
class UCListItemContent;
1303
@@ -29,6 +38,7 @@
1304
29
class UCListItemActions;
38
class UCListItemActions;
1305
30
class UCListItemSnapAnimator;
39
class UCListItemSnapAnimator;
1306
31
class UCListItemStyle;
40
class UCListItemStyle;
1307
41
class UCActionPanel;
1308
32
class UCListItemPrivate : public UCStyledItemBasePrivate
42
class UCListItemPrivate : public UCStyledItemBasePrivate
1309
33
{
43
{
1310
34
    Q_DECLARE_PUBLIC(UCListItem)
44
    Q_DECLARE_PUBLIC(UCListItem)
1311
@@ -53,19 +63,17 @@
1312
53
    bool canHighlight(QMouseEvent *event);
63
    bool canHighlight(QMouseEvent *event);
1313
54
    void setHighlighted(bool pressed);
64
    void setHighlighted(bool pressed);
1314
55
    void setSwiped(bool tugged);
65
    void setSwiped(bool tugged);
1315
56
    bool grabPanel(UCListItemActions *optionList, bool isTugged);
1316
57
    void listenToRebind(bool listen);
66
    void listenToRebind(bool listen);
1318
58
    void resize();
67
    void lockContentItem(bool lock);
1319
68
    void adjustContentItemHeight();
1320
59
    void update();
69
    void update();
1321
60
    void clampAndMoveX(qreal &x, qreal dx);
70
    void clampAndMoveX(qreal &x, qreal dx);
1322
61
71
1323
62
    bool highlighted:1;
72
    bool highlighted:1;
1324
63
    bool contentMoved:1;
73
    bool contentMoved:1;
1325
64
    bool highlightColorChanged:1;
1326
65
    bool swiped:1;
74
    bool swiped:1;
1327
66
    bool suppressClick:1;
75
    bool suppressClick:1;
1328
67
    bool ready:1;
76
    bool ready:1;
1329
68
    bool customStyle:1;
1330
69
    bool customColor:1;
77
    bool customColor:1;
1331
70
    bool customOvershoot:1;
78
    bool customOvershoot:1;
1332
71
    bool flicked:1;
79
    bool flicked:1;
1333
@@ -77,45 +85,65 @@
1334
77
    QColor highlightColor;
85
    QColor highlightColor;
1335
78
    QPointer<QQuickItem> countOwner;
86
    QPointer<QQuickItem> countOwner;
1336
79
    QPointer<QQuickFlickable> flickable;
87
    QPointer<QQuickFlickable> flickable;
1338
80
    QPointer<UCListItemAttached> attachedProperties;
88
    QPointer<UCViewItemsAttached> parentAttached;
1339
81
    QQuickItem *contentItem;
89
    QQuickItem *contentItem;
1340
82
    UCListItemDivider *divider;
90
    UCListItemDivider *divider;
1341
83
    UCListItemActions *leadingActions;
91
    UCListItemActions *leadingActions;
1342
84
    UCListItemActions *trailingActions;
92
    UCListItemActions *trailingActions;
1343
93
    UCActionPanel *leadingPanel;
1344
94
    UCActionPanel *trailingPanel;
1345
85
    UCListItemSnapAnimator *animator;
95
    UCListItemSnapAnimator *animator;
1346
86
96
1347
87
    // FIXME move these to StyledItemBase togehther with subtheming.
97
    // FIXME move these to StyledItemBase togehther with subtheming.
1348
88
    QQmlComponent *styleComponent;
98
    QQmlComponent *styleComponent;
1349
99
    QQmlComponent *implicitStyleComponent;
1350
89
    UCListItemStyle *styleItem;
100
    UCListItemStyle *styleItem;
1351
90
101
1352
91
    // getters/setters
102
    // getters/setters
1353
92
    qreal swipeOvershoot() const;
103
    qreal swipeOvershoot() const;
1354
93
    void setSwipeOvershoot(qreal overshoot);
104
    void setSwipeOvershoot(qreal overshoot);
1355
105
    void resetSwipeOvershoot();
1356
94
    QQmlListProperty<QObject> data();
106
    QQmlListProperty<QObject> data();
1357
95
    QQmlListProperty<QQuickItem> children();
107
    QQmlListProperty<QQuickItem> children();
1358
96
    bool contentMoving() const;
108
    bool contentMoving() const;
1359
97
    void setContentMoving(bool moved);
109
    void setContentMoving(bool moved);
1360
98
    QQmlComponent *style() const;
110
    QQmlComponent *style() const;
1361
99
    void setStyle(QQmlComponent *delegate);
111
    void setStyle(QQmlComponent *delegate);
1363
100
    bool loadStyle(bool reload);
112
    void resetStyle();
1364
101
    void initStyleItem();
113
    void initStyleItem();
1365
102
    QQuickItem *styleInstance() const;
114
    QQuickItem *styleInstance() const;
1366
103
};
115
};
1367
104
116
1368
117
class UCListItemAttachedPrivate : public QObjectPrivate
1369
118
{
1370
119
    Q_DECLARE_PUBLIC(UCListItemAttached)
1371
120
public:
1372
121
    UCListItemAttachedPrivate() : QObjectPrivate(), panel(0), listItem(0) {}
1373
122
1374
123
    static UCListItemAttachedPrivate* get(UCListItemAttached *that)
1375
124
    {
1376
125
        return that->d_func();
1377
126
    }
1378
127
1379
128
    UCActionPanel *panel;
1380
129
    UCListItem *listItem;
1381
130
    QList<UCAction*> visibleActions;
1382
131
};
1383
132
1384
105
class PropertyChange;
133
class PropertyChange;
1386
106
class UCListItemAttachedPrivate
134
class UCViewItemsAttachedPrivate
1387
107
{
135
{
1389
108
    Q_DECLARE_PUBLIC(UCListItemAttached)
136
    Q_DECLARE_PUBLIC(UCViewItemsAttached)
1390
109
public:
137
public:
1393
110
    UCListItemAttachedPrivate(UCListItemAttached *qq);
138
    UCViewItemsAttachedPrivate(UCViewItemsAttached *qq);
1394
111
    ~UCListItemAttachedPrivate();
139
    ~UCViewItemsAttachedPrivate();
1395
112
140
1396
113
    void clearFlickablesList();
141
    void clearFlickablesList();
1397
114
    void buildFlickablesList();
142
    void buildFlickablesList();
1398
115
    void clearChangesList();
143
    void clearChangesList();
1399
116
    void buildChangesList(const QVariant &newValue);
144
    void buildChangesList(const QVariant &newValue);
1400
117
145
1402
118
    UCListItemAttached *q_ptr;
146
    UCViewItemsAttached *q_ptr;
1403
119
    bool globalDisabled;
147
    bool globalDisabled;
1404
120
    QList< QPointer<QQuickFlickable> > flickables;
148
    QList< QPointer<QQuickFlickable> > flickables;
1405
121
    QList< PropertyChange* > changes;
149
    QList< PropertyChange* > changes;
1406
@@ -123,6 +151,41 @@
1407
123
    QPointer<UCListItem> disablerItem;
151
    QPointer<UCListItem> disablerItem;
1408
124
};
152
};
1409
125
153
1410
154
class UCActionPanel : public QObject
1411
155
{
1412
156
    Q_OBJECT
1413
157
public:
1414
158
    ~UCActionPanel();
1415
159
    static bool grabPanel(UCActionPanel **panel, UCListItem *item, bool leading);
1416
160
    static void ungrabPanel(UCActionPanel *panel);
1417
161
    static bool isConnected(UCActionPanel *panel);
1418
162
1419
163
    UCListItemActions *actions();
1420
164
    QQuickItem *panel() const;
1421
165
    UCListItem::PanelStatus panelStatus()
1422
166
    {
1423
167
        return status;
1424
168
    }
1425
169
    bool isLeading() const
1426
170
    {
1427
171
        return leading;
1428
172
    }
1429
173
1430
174
Q_SIGNALS:
1431
175
    void statusChanged();
1432
176
1433
177
private:
1434
178
    UCActionPanel(UCListItem *item, bool leading);
1435
179
    bool createPanel(QQmlComponent *panelDelegate);
1436
180
    UCListItemAttached *attachedObject();
1437
181
1438
182
    UCListItem *listItem;
1439
183
    QQuickItem *panelItem;
1440
184
    UCListItem::PanelStatus status;
1441
185
    bool leading:1;
1442
186
    bool connected:1;
1443
187
};
1444
188
1445
126
class UCListItemDivider : public QObject
189
class UCListItemDivider : public QObject
1446
127
{
190
{
1447
128
    Q_OBJECT
191
    Q_OBJECT
1448
@@ -159,8 +222,6 @@
1449
159
    void setColorTo(const QColor &color);
222
    void setColorTo(const QColor &color);
1450
160
223
1451
161
    bool m_visible:1;
224
    bool m_visible:1;
1452
162
    bool m_leftMarginChanged:1;
1453
163
    bool m_rightMarginChanged:1;
1454
164
    bool m_colorFromChanged:1;
225
    bool m_colorFromChanged:1;
1455
165
    bool m_colorToChanged:1;
226
    bool m_colorToChanged:1;
1456
166
    qreal m_thickness;
227
    qreal m_thickness;
1457
@@ -187,6 +248,7 @@
1458
187
    ~UCListItemSnapAnimator();
248
    ~UCListItemSnapAnimator();
1459
188
249
1460
189
    bool snap(qreal to);
250
    bool snap(qreal to);
1461
251
    void stop();
1462
190
    void complete();
252
    void complete();
1463
191
253
1464
192
public Q_SLOTS:
254
public Q_SLOTS:
1465
193
255
1466
=== modified file 'modules/Ubuntu/Components/plugin/uclistitemactions.cpp'
1467
--- modules/Ubuntu/Components/plugin/uclistitemactions.cpp	2014-12-01 14:50:13 +0000
1468
+++ modules/Ubuntu/Components/plugin/uclistitemactions.cpp	2015-01-16 14:53:38 +0000
1469
@@ -27,167 +27,13 @@
1470
27
27
1471
28
UCListItemActionsPrivate::UCListItemActionsPrivate()
28
UCListItemActionsPrivate::UCListItemActionsPrivate()
1472
29
    : QObjectPrivate()
29
    : QObjectPrivate()
1473
30
    , status(UCListItemActions::Disconnected)
1474
31
    , offsetDragged(0)
1475
32
    , optionSlotWidth(0.0)
1476
33
    , delegate(0)
30
    , delegate(0)
1477
34
    , panelDelegate(0)
1478
35
    , panelItem(0)
1479
36
{
31
{
1480
37
}
32
}
1481
38
UCListItemActionsPrivate::~UCListItemActionsPrivate()
33
UCListItemActionsPrivate::~UCListItemActionsPrivate()
1482
39
{
34
{
1483
40
}
35
}
1484
41
36
1485
42
void UCListItemActionsPrivate::_q_updateDraggedOffset()
1486
43
{
1487
44
    UCListItem *listItem = qobject_cast<UCListItem*>(panelItem->parentItem());
1488
45
    if (!listItem) {
1489
46
        return;
1490
47
    }
1491
48
1492
49
    Q_Q(UCListItemActions);
1493
50
    offsetDragged = (status == UCListItemActions::Leading) ? panelItem->width() + panelItem->x() :
1494
51
                         listItem->width() - panelItem->x();
1495
52
    if (offsetDragged < 0.0) {
1496
53
        offsetDragged = 0.0;
1497
54
    }
1498
55
}
1499
56
1500
57
UCListItemActionsAttached *UCListItemActionsPrivate::attachedObject()
1501
58
{
1502
59
    if (!panelItem) {
1503
60
        return 0;
1504
61
    }
1505
62
    return static_cast<UCListItemActionsAttached*>(
1506
63
                qmlAttachedPropertiesObject<UCListItemActions>(panelItem, false));
1507
64
}
1508
65
1509
66
/*
1510
67
 * Connects a ListItem to the ListItemActions' panel and returns true upon successful connection.
1511
68
 * Connection may fail if there is a different ListItem connected. In this case the new ListItem
1512
69
 * will be queued and automatically connected when the previous ListItem disconnects.
1513
70
 * The panel is only re-created when a different Component is used to create it.
1514
71
 * FIXME - despite each ListItem uses the same document to create the panel, theming engine
1515
72
 * provides different Component objects for each, due to not caching the components created.
1516
73
 * This must be fixed to optimize memory usage.
1517
74
 */
1518
75
bool UCListItemActionsPrivate::connectToListItem(UCListItemActions *actions, UCListItem *listItem, bool leading)
1519
76
{
1520
77
    UCListItemActionsPrivate *_this = get(actions);
1521
78
    if (!_this) {
1522
79
        return false;
1523
80
    }
1524
81
    // do we have a panel created already?
1525
82
    if (_this->panelItem) {
1526
83
        if (isConnectedTo(actions, listItem)) {
1527
84
            return true;
1528
85
        }
1529
86
        if (_this->panelItem->parentItem() && _this->panelItem->parentItem() != listItem) {
1530
87
            // set the requesting listItem as queuedItem
1531
88
            _this->queuedItem = listItem;
1532
89
            return false;
1533
90
        }
1534
91
    }
1535
92
    // no parent set or panelItem yet, proceed with panel creation
1536
93
    UCListItemPrivate *pItem = UCListItemPrivate::get(listItem);
1537
94
    pItem->initStyleItem();
1538
95
    if (!pItem->styleItem || (pItem->styleItem && !_this->createPanelItem(pItem->styleItem->m_actionsDelegate))) {
1539
96
        return false;
1540
97
    }
1541
98
1542
99
    // check if the panel is still connected to a ListItem
1543
100
    // this may happen if there is a swipe over an other item while the previous
1544
101
    // one is rebounding
1545
102
    _this->panelItem->setParentItem(listItem);
1546
103
    if (_this->attachedObject()) {
1547
104
        _this->attachedObject()->connectListItem(listItem, true);
1548
105
    }
1549
106
    _this->offsetDragged = 0.0;
1550
107
    _this->status = leading ? UCListItemActions::Leading : UCListItemActions::Trailing;
1551
108
    Q_EMIT actions->statusChanged(_this->status);
1552
109
    return true;
1553
110
}
1554
111
1555
112
void UCListItemActionsPrivate::disconnectFromListItem(UCListItemActions *actions)
1556
113
{
1557
114
    UCListItemActionsPrivate *_this = get(actions);
1558
115
    if (!_this || !_this->panelItem || !_this->panelItem->parentItem()) {
1559
116
        return;
1560
117
    }
1561
118
1562
119
    if (_this->attachedObject()) {
1563
120
        _this->attachedObject()->connectListItem(static_cast<UCListItem*>(_this->panelItem->parentItem()), false);
1564
121
    }
1565
122
    _this->panelItem->setParentItem(0);
1566
123
    _this->status = UCListItemActions::Disconnected;
1567
124
    Q_EMIT actions->statusChanged(_this->status);
1568
125
    // if there was a queuedItem, make it grab the actions list
1569
126
    if (_this->queuedItem) {
1570
127
        UCListItemPrivate::get(_this->queuedItem.data())->grabPanel(actions, true);
1571
128
        // remove item from queue
1572
129
        _this->queuedItem.clear();
1573
130
    }
1574
131
}
1575
132
1576
133
bool UCListItemActionsPrivate::isConnectedTo(UCListItemActions *actions, UCListItem *listItem)
1577
134
{
1578
135
    UCListItemActionsPrivate *_this = get(actions);
1579
136
    return _this && _this->panelItem &&
1580
137
            (_this->status != UCListItemActions::Disconnected) &&
1581
138
            (_this->panelItem->parentItem() == listItem);
1582
139
}
1583
140
1584
141
QQuickItem *UCListItemActionsPrivate::createPanelItem(QQmlComponent *panel)
1585
142
{
1586
143
    if (panelItem && panelDelegate == panel) {
1587
144
        return panelItem;
1588
145
    }
1589
146
    // delete the panel if the next item's actionsDelegate differs from the
1590
147
    // one this panel was created from
1591
148
    if (panelDelegate != panel) {
1592
149
        delete panelItem;
1593
150
        panelItem = 0;
1594
151
    }
1595
152
1596
153
    Q_Q(UCListItemActions);
1597
154
    if (!panel) {
1598
155
        qmlInfo(q) << UbuntuI18n::instance().tr("actionsDelegate not set!");
1599
156
        return 0;
1600
157
    }
1601
158
1602
159
    panelDelegate = panel;
1603
160
    if (!panelDelegate->isError()) {
1604
161
        panelItem = qobject_cast<QQuickItem*>(panelDelegate->beginCreate(qmlContext(q)));
1605
162
        if (panelItem) {
1606
163
            QQml_setParent_noEvent(panelItem, q);
1607
164
            // add panelItem to data so we can access it in case is needed (i.e. tests)
1608
165
            data.append(panelItem);
1609
166
            // create attached property!
1610
167
            UCListItemActionsAttached *attached = static_cast<UCListItemActionsAttached*>(
1611
168
                        qmlAttachedPropertiesObject<UCListItemActions>(panelItem));
1612
169
            if (!attached->container()) {
1613
170
                attached->setList(q);
1614
171
            } else {
1615
172
                // container is set, but we need to emit the signal again so we get the
1616
173
                // attached props updated for those cases when the attached property is
1617
174
                // created before the statement above
1618
175
                Q_EMIT attached->containerChanged();
1619
176
            }
1620
177
            panelDelegate->completeCreate();
1621
178
1622
179
            // calculate option's slot size
1623
180
            offsetDragged = 0.0;
1624
181
            // connect to panel to catch dragging
1625
182
            QObject::connect(panelItem, SIGNAL(xChanged()), q, SLOT(_q_updateDraggedOffset()));
1626
183
        }
1627
184
    } else {
1628
185
        qmlInfo(q) << panelDelegate->errorString();
1629
186
    }
1630
187
1631
188
    return panelItem;
1632
189
}
1633
190
1634
191
/*!
37
/*!
1635
192
 * \qmltype ListItemActions
38
 * \qmltype ListItemActions
1636
193
 * \instantiates UCListItemActions
39
 * \instantiates UCListItemActions
1637
@@ -199,86 +45,22 @@
1638
199
 *
45
 *
1639
200
 * ListItem accepts actions that can be configured to appear when swiped to left
46
 * ListItem accepts actions that can be configured to appear when swiped to left
1640
201
 * or right. The API does not limit the number of actions to be assigned for leading
47
 * or right. The API does not limit the number of actions to be assigned for leading
1642
202
 * or trailing actions, however the design constrains are allowing a maximum of
48
 * or trailing actions, however the design constraints are allowing a maximum of
1643
203
 * 1 action on leading- and a maximum of 3 actions on trailing side of the ListItem.
49
 * 1 action on leading- and a maximum of 3 actions on trailing side of the ListItem.
1644
204
 *
50
 *
1645
205
 * The \l actions are Action instances or elements derived from Action. The default
51
 * The \l actions are Action instances or elements derived from Action. The default
1646
206
 * visualization of the actions can be overridden using the \l delegate property,
52
 * visualization of the actions can be overridden using the \l delegate property,
1647
207
 * and the default implementation uses the \c name property of the Action.
53
 * and the default implementation uses the \c name property of the Action.
1648
208
 *
54
 *
1649
209
 * The leading and trailing actions are placed on a panel item, which is created
1650
210
 * the first time the actions are accessed. The colors of the panel is taken from
1651
211
 * the theme's palette.
1652
212
 *
1653
213
 * When swiped, panels reveal the actions one by one. In case an action is revealed
1654
214
 * more than 50%, the action will be snapped and revealed completely. This is also
1655
215
 * valid for the case when the action is visible less than 50%, in which case the
1656
216
 * action is hidden. Actions can be triggered by tapping.
1657
217
 *
1658
218
 * \note You can use the same ListItemActions for leading and for trailing actions
1659
219
 * the same time only if the instance is used by different groups of list items,
1660
220
 * where one group uses it as leading and other group as trailing. In any other
1661
221
 * circumstances use separate ListItemActions for leading and trailing actions.
1662
222
 * \qml
1663
223
 * import QtQuick 2.2
1664
224
 * import Ubuntu.Components 1.2
1665
225
 * MainView {
1666
226
 *     width: units.gu(40)
1667
227
 *     height: units.gu(71)
1668
228
 *
1669
229
 *     ListItemActions {
1670
230
 *         id: sharedActions
1671
231
 *         actions: [
1672
232
 *             Action {
1673
233
 *                 iconName: "search"
1674
234
 *             },
1675
235
 *             Action {
1676
236
 *                 iconName: "edit"
1677
237
 *             },
1678
238
 *             Action {
1679
239
 *                 iconName: "copy"
1680
240
 *             }
1681
241
 *         ]
1682
242
 *     }
1683
243
 *
1684
244
 *     Column {
1685
245
 *         ListItem {
1686
246
 *             leadingActions: sharedActions
1687
247
 *         }
1688
248
 *         UbuntuListView {
1689
249
 *             anchors.fill: parent
1690
250
 *             model: 10000
1691
251
 *             delegate: ListItem {
1692
252
 *                 trailingActions: sharedActions
1693
253
 *             }
1694
254
 *         }
1695
255
 *     }
1696
256
 * }
1697
257
 * \endqml
1698
258
 *
1699
259
 * \section3 Using with ListViews
55
 * \section3 Using with ListViews
1700
260
 * ListItemActions instances can be shared between ListItem instances within the
56
 * ListItemActions instances can be shared between ListItem instances within the
1701
261
 * same view. When shared, the memory footprint of the view will be lot smaller,
57
 * same view. When shared, the memory footprint of the view will be lot smaller,
1711
262
 * as there will be no individual panel created for each list's actions visualization.
58
 * as there will be no individual action container created for each list's actions.
1703
263
 * Depending on how long the initialization of the component used in \l {ListItemStyle::actionsDelegate}
1704
264
 * {actionsDelegate} takes, creation time will be also reduced to one time per view.
1705
265
 * However, this implies that swiping a new ListItem content while another one is
1706
266
 * swiped will result in showing the newly swiped item's panel delayed, as the
1707
267
 * panel can be shown only after the previous item's snapping is completed. Depending
1708
268
 * on the \l {ListItemStyle::snapAnimation}{snapAnimation} duration, this may take some time, and the
1709
269
 * response time of the UI can become unacceptable.
1710
270
 *
1712
271
 * Having individual ListItemActions instances increases the memory footprint,
59
 * Having individual ListItemActions instances increases the memory footprint,
1719
272
 * however the UI will be more responsive as swiping individual ListItems will
60
 * and also has performance impact on kinetic scrolling.
1714
273
 * not have to wait till the previous ListItem's panel is snapped out (rebound).
1715
274
 * On the other hand, memory consumption will increase significantly due to
1716
275
 * separate panel creation, and performance may decrease with up to 40%, depending
1717
276
 * on what way are the actions declared, within the ListItemActions or as shared
1718
277
 * actions.
1720
278
 *
61
 *
1724
279
 * The example above illustrates how to share ListItemActions between ListItem
62
 * The examples below illustrate the worst and best practice when used in a ListView.
1725
280
 * delegates, which can be the worst-performant but most lightwaight memory consumer
63
 * The worst case:
1723
281
 * setup. The following example illustrates the worst case:
1726
282
 * \qml
64
 * \qml
1727
283
 * import QtQuick 2.2
65
 * import QtQuick 2.2
1728
284
 * import Ubuntu.Components 1.2
66
 * import Ubuntu.Components 1.2
1729
@@ -323,33 +105,33 @@
1730
323
 *     width: units.gu(40)
105
 *     width: units.gu(40)
1731
324
 *     height: units.gu(71)
106
 *     height: units.gu(71)
1732
325
 *
107
 *
1735
326
 *     property list<Action> leading: [
108
 *     ListItemActions {
1736
327
 *         Action {
109
 *         id: leading
1737
110
 *         actions: Action {
1738
328
 *             iconName: "delete"
111
 *             iconName: "delete"
1739
329
 *         }
112
 *         }
1752
330
 *     ]
113
 *     }
1753
331
 *     property list<Action> trailing: [
114
 *     ListItemActions {
1754
332
 *         Action {
115
 *         id: trailing
1755
333
 *             iconName: "search"
116
 *         actions: [
1756
334
 *         },
117
 *             Action {
1757
335
 *         Action {
118
 *                 iconName: "search"
1758
336
 *             iconName: "edit"
119
 *             },
1759
337
 *         },
120
 *             Action {
1760
338
 *         Action {
121
 *                 iconName: "edit"
1761
339
 *             iconName: "copy"
122
 *             },
1762
340
 *         }
123
 *             Action {
1763
341
 *     ]
124
 *                 iconName: "copy"
1764
125
 *             }
1765
126
 *         ]
1766
127
 *     }
1767
342
 *
128
 *
1768
343
 *     UbuntuListView {
129
 *     UbuntuListView {
1769
344
 *         anchors.fill: parent
130
 *         anchors.fill: parent
1770
345
 *         model: 10000
131
 *         model: 10000
1771
346
 *         delegate: ListItem {
132
 *         delegate: ListItem {
1778
347
 *             leadingActions: ListItemActions {
133
 *             leadingActions: leading
1779
348
 *                 actions: leading
134
 *             trailingActions: trailing
1774
349
 *             }
1775
350
 *             trailingActions: ListItemActions {
1776
351
 *                 actions: trailing
1777
352
 *             }
1780
353
 *         }
135
 *         }
1781
354
 *     }
136
 *     }
1782
355
 * }
137
 * }
1783
@@ -362,11 +144,6 @@
1784
362
 * parameter to identify the instance of the ListItem on which it was executed,
144
 * parameter to identify the instance of the ListItem on which it was executed,
1785
363
 * in which case ListItem will change the type from \c Actions.None to \c Actions.Integer
145
 * in which case ListItem will change the type from \c Actions.None to \c Actions.Integer
1786
364
 * when it is triggered.
146
 * when it is triggered.
1787
365
 *
1788
366
 * \section3 Attached properties
1789
367
 * ListItemActions provides a set of attached properties to the panels visualizing
1790
368
 * the actions. These properties can be used by implementations visualizing the
1791
369
 * actions.
1792
370
 */
147
 */
1793
371
148
1794
372
UCListItemActions::UCListItemActions(QObject *parent)
149
UCListItemActions::UCListItemActions(QObject *parent)
1795
@@ -377,28 +154,6 @@
1796
377
{
154
{
1797
378
}
155
}
1798
379
156
1799
380
UCListItemActionsAttached *UCListItemActions::qmlAttachedProperties(QObject *owner)
1800
381
{
1801
382
    /*
1802
383
     * Detect the attachee, whether is it a child item of the panelItem. The panelItem
1803
384
     * itself cannot be detected, as the object can be attached during the call of
1804
385
     * component.beginCreate().
1805
386
     */
1806
387
    UCListItemActionsAttached *attached = new UCListItemActionsAttached(owner);
1807
388
    QQuickItem *item = qobject_cast<QQuickItem*>(owner);
1808
389
    while (item) {
1809
390
        // has item our attached property?
1810
391
        UCListItemActionsAttached *itemAttached = static_cast<UCListItemActionsAttached*>(
1811
392
                    qmlAttachedPropertiesObject<UCListItemActions>(item, false));
1812
393
        if (itemAttached) {
1813
394
            attached->setList(itemAttached->container());
1814
395
            break;
1815
396
        }
1816
397
        item = item->parentItem();
1817
398
    }
1818
399
    return attached;
1819
400
}
1820
401
1821
402
/*!
157
/*!
1822
403
 * \qmlproperty Component ListItemActions::delegate
158
 * \qmlproperty Component ListItemActions::delegate
1823
404
 * The property holds the custom delegate to visualize the actions listed in the
159
 * The property holds the custom delegate to visualize the actions listed in the
1824
@@ -461,7 +216,7 @@
1825
461
 * }
216
 * }
1826
462
 * \endqml
217
 * \endqml
1827
463
 * \note Putting a Rectangle in the delegate can be used to override the color
218
 * \note Putting a Rectangle in the delegate can be used to override the color
1829
464
 * of the panel.
219
 * of the panel. Also all ListItem attached properties can be used in the delegates.
1830
465
 *
220
 *
1831
466
 * Defaults to null.
221
 * Defaults to null.
1832
467
 */
222
 */
1833
468
223
1834
=== modified file 'modules/Ubuntu/Components/plugin/uclistitemactions.h'
1835
--- modules/Ubuntu/Components/plugin/uclistitemactions.h	2014-12-01 12:20:02 +0000
1836
+++ modules/Ubuntu/Components/plugin/uclistitemactions.h	2015-01-16 14:53:38 +0000
1837
@@ -22,7 +22,6 @@
1838
22
22
1839
23
class QQmlComponent;
23
class QQmlComponent;
1840
24
class UCAction;
24
class UCAction;
1841
25
class UCListItemActionsAttached;
1842
26
class UCListItemActionsPrivate;
25
class UCListItemActionsPrivate;
1843
27
class UCListItemActions : public QObject
26
class UCListItemActions : public QObject
1844
28
{
27
{
1845
@@ -31,18 +30,10 @@
1846
31
    Q_PROPERTY(QQmlListProperty<UCAction> actions READ actions CONSTANT)
30
    Q_PROPERTY(QQmlListProperty<UCAction> actions READ actions CONSTANT)
1847
32
    Q_PROPERTY(QQmlListProperty<QObject> data READ data)
31
    Q_PROPERTY(QQmlListProperty<QObject> data READ data)
1848
33
    Q_CLASSINFO("DefaultProperty", "data")
32
    Q_CLASSINFO("DefaultProperty", "data")
1849
34
    Q_ENUMS(Status)
1850
35
public:
33
public:
1851
36
    enum Status {
1852
37
        Disconnected,
1853
38
        Leading,
1854
39
        Trailing
1855
40
    };
1856
41
    explicit UCListItemActions(QObject *parent = 0);
34
    explicit UCListItemActions(QObject *parent = 0);
1857
42
    ~UCListItemActions();
35
    ~UCListItemActions();
1858
43
36
1859
44
    static UCListItemActionsAttached *qmlAttachedProperties(QObject *owner);
1860
45
1861
46
    QQmlComponent *delegate() const;
37
    QQmlComponent *delegate() const;
1862
47
    void setDelegate(QQmlComponent *delegate);
38
    void setDelegate(QQmlComponent *delegate);
1863
48
    QQmlListProperty<UCAction> actions();
39
    QQmlListProperty<UCAction> actions();
1864
@@ -50,64 +41,9 @@
1865
50
41
1866
51
Q_SIGNALS:
42
Q_SIGNALS:
1867
52
    void delegateChanged();
43
    void delegateChanged();
1868
53
    void statusChanged(Status status);
1869
54
44
1870
55
private:
45
private:
1871
56
    Q_DECLARE_PRIVATE(UCListItemActions)
46
    Q_DECLARE_PRIVATE(UCListItemActions)
1927
57
    Q_PRIVATE_SLOT(d_func(), void _q_updateDraggedOffset())
47
};
1873
58
};
1874
59
1875
60
class UCListItemActionsAttached : public QObject
1876
61
{
1877
62
    Q_OBJECT
1878
63
    Q_PROPERTY(UCListItemActions *container READ container NOTIFY containerChanged)
1879
64
    Q_PROPERTY(QQmlListProperty<UCAction> visibleActions READ visibleActions NOTIFY visibleActionsChanged)
1880
65
    Q_PROPERTY(UCListItem *listItem READ listItem NOTIFY listItemChanged)
1881
66
    Q_PROPERTY(int listItemIndex READ listItemIndex NOTIFY listItemIndexChanged)
1882
67
    Q_PROPERTY(qreal offset READ offset NOTIFY offsetChanged)
1883
68
    Q_PROPERTY(UCListItemActions::Status status READ status NOTIFY statusChanged)
1884
69
    Q_PROPERTY(bool swiping READ swiping NOTIFY swipingChanged)
1885
70
public:
1886
71
    UCListItemActionsAttached(QObject *parent = 0);
1887
72
    ~UCListItemActionsAttached();
1888
73
    void setList(UCListItemActions *list);
1889
74
    void connectListItem(UCListItem *item, bool connect);
1890
75
1891
76
    UCListItemActions *container() const
1892
77
    {
1893
78
        return m_container.data();
1894
79
    }
1895
80
    QQmlListProperty<UCAction> visibleActions();
1896
81
    UCListItem *listItem();
1897
82
    int listItemIndex();
1898
83
    bool swiping();
1899
84
    qreal offset();
1900
85
    UCListItemActions::Status status();
1901
86
1902
87
1903
88
public Q_SLOTS:
1904
89
    void snapToPosition(qreal position);
1905
90
1906
91
Q_SIGNALS:
1907
92
    void containerChanged();
1908
93
    void visibleActionsChanged();
1909
94
    void listItemChanged();
1910
95
    void listItemIndexChanged();
1911
96
    void offsetChanged();
1912
97
    void statusChanged();
1913
98
    void swipingChanged();
1914
99
1915
100
private:
1916
101
    QPointer<UCListItemActions> m_container;
1917
102
    QList<UCAction*> m_visibleActions;
1918
103
    bool m_swiping;
1919
104
    friend class UCListItemAction;
1920
105
1921
106
private Q_SLOTS:
1922
107
    void updateVisibleActions();
1923
108
    void updateSwipeState();
1924
109
};
1925
110
1926
111
QML_DECLARE_TYPEINFO(UCListItemActions, QML_HAS_ATTACHED_PROPERTIES)
1928
112
48
1929
113
#endif // UCLISTITEMACTIONS_H
49
#endif // UCLISTITEMACTIONS_H
1930
114
50
1931
=== modified file 'modules/Ubuntu/Components/plugin/uclistitemactions_p.h'
1932
--- modules/Ubuntu/Components/plugin/uclistitemactions_p.h	2014-12-01 13:42:47 +0000
1933
+++ modules/Ubuntu/Components/plugin/uclistitemactions_p.h	2015-01-16 14:53:38 +0000
1934
@@ -32,30 +32,14 @@
1935
32
        return actions ? actions->d_func() : 0;
32
        return actions ? actions->d_func() : 0;
1936
33
    }
33
    }
1937
34
34
1938
35
    UCListItemActions::Status status;
1939
36
    qreal offsetDragged;
1940
37
    qreal optionSlotWidth;
1941
38
1942
39
    QQmlComponent *delegate;
35
    QQmlComponent *delegate;
1943
40
    QQmlComponent *panelDelegate;
1944
41
    QQuickItem *panelItem;
1945
42
    QList<UCAction*> actions;
36
    QList<UCAction*> actions;
1946
43
    QList<QObject*> data;
37
    QList<QObject*> data;
1947
44
    QPointer<UCListItem> queuedItem;
1948
45
1949
46
    void _q_updateDraggedOffset();
1950
47
    UCListItemActionsAttached *attachedObject();
1951
48
1952
49
    static bool connectToListItem(UCListItemActions *options, UCListItem *listItem, bool leading);
1953
50
    static void disconnectFromListItem(UCListItemActions *options);
1954
51
    static bool isConnectedTo(UCListItemActions *options, UCListItem *listItem);
1955
52
38
1956
53
    static int actions_count(QQmlListProperty<UCAction> *p);
39
    static int actions_count(QQmlListProperty<UCAction> *p);
1957
54
    static void actions_append(QQmlListProperty<UCAction> *p, UCAction *v);
40
    static void actions_append(QQmlListProperty<UCAction> *p, UCAction *v);
1958
55
    static UCAction *actions_at(QQmlListProperty<UCAction>*, int);
41
    static UCAction *actions_at(QQmlListProperty<UCAction>*, int);
1959
56
    static void actions_clear(QQmlListProperty<UCAction>*);
42
    static void actions_clear(QQmlListProperty<UCAction>*);
1960
57
1961
58
    QQuickItem *createPanelItem(QQmlComponent *delegate);
1962
59
};
43
};
1963
60
44
1964
61
#endif // UCLISTITEMACTIONS_P_H
45
#endif // UCLISTITEMACTIONS_P_H
1965
62
46
1966
=== renamed file 'modules/Ubuntu/Components/plugin/uclistitemactionsattached.cpp' => 'modules/Ubuntu/Components/plugin/uclistitemattached.cpp'
1967
--- modules/Ubuntu/Components/plugin/uclistitemactionsattached.cpp	2014-12-18 10:08:56 +0000
1968
+++ modules/Ubuntu/Components/plugin/uclistitemattached.cpp	2015-01-16 14:53:38 +0000
1969
@@ -21,218 +21,154 @@
1970
21
#include "ucunits.h"
21
#include "ucunits.h"
1971
22
#include "ucaction.h"
22
#include "ucaction.h"
1972
23
23
1992
24
UCListItemActionsAttached::UCListItemActionsAttached(QObject *parent)
24
UCListItemAttached::UCListItemAttached(QObject *parent)
1993
25
    : QObject(parent)
25
    : QObject(*(new UCListItemAttachedPrivate()), parent)
1994
26
    , m_swiping(false)
26
{
1995
27
{
27
}
1996
28
}
28
1997
29
29
UCListItemAttached::~UCListItemAttached()
1998
30
UCListItemActionsAttached::~UCListItemActionsAttached()
30
{
1999
31
{
31
}
2000
32
}
32
2001
33
33
void UCListItemAttached::connectToAttached(UCListItemAttached *parentAttached)
2002
34
/*!
34
{
2003
35
 * \qmlattachedproperty ListItemActions ListItemActions::container
35
    bool visualizeActions = UCListItemAttachedPrivate::get(parentAttached)->panel;
2004
36
 * \readonly
36
    bool isLeading = visualizeActions ? UCListItemAttachedPrivate::get(parentAttached)->panel->isLeading() : false;
2005
37
 * The property holds the instance of the \l ListItemActions the ListItem's actions
37
    setList(parentAttached->item(), isLeading, visualizeActions);
2006
38
 * panel is visualizing.
38
}
2007
39
 */
39
2008
40
void UCListItemActionsAttached::setList(UCListItemActions *list)
40
void UCListItemAttached::setList(UCListItem *list, bool leading, bool visualizeActions)
2009
41
{
41
{
2010
42
    if (list == m_container) {
42
    Q_D(UCListItemAttached);
2011
43
    if (d->listItem == list) {
2012
43
        return;
44
        return;
2013
44
    }
45
    }
2016
45
    m_container = list;
46
    d->listItem = list;
2017
46
    if (!m_container.isNull()) {
47
    Q_EMIT itemChanged();
2018
48
2019
49
    if (visualizeActions) {
2020
50
        d->panel = leading ? UCListItemPrivate::get(d->listItem)->leadingPanel : UCListItemPrivate::get(d->listItem)->trailingPanel;
2021
51
    } else {
2022
52
        d->panel = 0;
2023
53
    }
2024
54
    if (d->panel) {
2025
47
        // connect statusChanged() to update status, listItem, listItemIndex and overshoot values
55
        // connect statusChanged() to update status, listItem, listItemIndex and overshoot values
2037
48
        QObject::connect(m_container.data(), &UCListItemActions::statusChanged,
56
        QObject::connect(d->panel, &UCActionPanel::statusChanged,
2038
49
                         this, &UCListItemActionsAttached::statusChanged);
57
                         this, &UCListItemAttached::panelStatusChanged);
2028
50
        QObject::connect(m_container.data(), &UCListItemActions::statusChanged,
2029
51
                         this, &UCListItemActionsAttached::listItemChanged);
2030
52
        QObject::connect(m_container.data(), &UCListItemActions::statusChanged,
2031
53
                         this, &UCListItemActionsAttached::listItemIndexChanged);
2032
54
2033
55
        UCListItemActionsPrivate *actions = UCListItemActionsPrivate::get(m_container.data());
2034
56
        // connect panel's xChanged to update the dragged offset
2035
57
        QObject::connect(actions->panelItem, &QQuickItem::xChanged,
2036
58
                         this, &UCListItemActionsAttached::offsetChanged);
2039
59
58
2040
60
        // connect actions to get updates about visible changes
59
        // connect actions to get updates about visible changes
2042
61
        Q_FOREACH(UCAction *action, UCListItemActionsPrivate::get(m_container)->actions) {
60
        Q_FOREACH(UCAction *action, UCListItemActionsPrivate::get(d->panel->actions())->actions) {
2043
62
            QObject::connect(action, &UCAction::visibleChanged,
61
            QObject::connect(action, &UCAction::visibleChanged,
2045
63
                             this, &UCListItemActionsAttached::updateVisibleActions);
62
                             this, &UCListItemAttached::updateVisibleActions);
2046
64
        }
63
        }
2047
65
        updateVisibleActions();
64
        updateVisibleActions();
2068
66
    }
65
        Q_EMIT actionsChanged();
2069
67
    Q_EMIT containerChanged();
66
        Q_EMIT visibleActionsChanged();
2050
68
    Q_EMIT visibleActionsChanged();
2051
69
}
2052
70
2053
71
void UCListItemActionsAttached::connectListItem(UCListItem *item, bool connect)
2054
72
{
2055
73
    if (!item) {
2056
74
        return;
2057
75
    }
2058
76
    if (connect) {
2059
77
        QObject::connect(item, &UCListItem::highlightedChanged,
2060
78
                         this, &UCListItemActionsAttached::updateSwipeState);
2061
79
        QObject::connect(item, &UCListItem::contentMovingChanged,
2062
80
                         this, &UCListItemActionsAttached::updateSwipeState);
2063
81
    } else {
2064
82
        QObject::disconnect(item, &UCListItem::highlightedChanged,
2065
83
                            this, &UCListItemActionsAttached::updateSwipeState);
2066
84
        QObject::disconnect(item, &UCListItem::contentMovingChanged,
2067
85
                            this, &UCListItemActionsAttached::updateSwipeState);
2070
86
    }
67
    }
2071
87
}
68
}
2072
88
69
2073
89
// private slot to update visible actions
70
// private slot to update visible actions
2075
90
void UCListItemActionsAttached::updateVisibleActions()
71
void UCListItemAttached::updateVisibleActions()
2076
91
{
72
{
2080
92
    m_visibleActions.clear();
73
    Q_D(UCListItemAttached);
2081
93
    if (!m_container.isNull()) {
74
    if (d->panel) {
2082
94
        Q_FOREACH(UCAction *action, UCListItemActionsPrivate::get(m_container)->actions) {
75
        d->visibleActions.clear();
2083
76
        Q_FOREACH(UCAction *action, UCListItemActionsPrivate::get(d->panel->actions())->actions) {
2084
95
            if (action->m_visible) {
77
            if (action->m_visible) {
2086
96
                m_visibleActions << action;
78
                d->visibleActions << action;
2087
97
            }
79
            }
2088
98
        }
80
        }
2089
81
        Q_EMIT visibleActionsChanged();
2090
99
    }
82
    }
2091
100
    Q_EMIT visibleActionsChanged();
2092
101
}
83
}
2093
102
84
2096
103
// private slot updating swipe state
85
/*!
2097
104
void UCListItemActionsAttached::updateSwipeState()
86
 * \qmlattachedproperty ListItemActions ListItem::actions
2098
87
 * \readonly
2099
88
 * The property holds the instance of the \l ListItemActions the ListItem's actions
2100
89
 * panel is visualizing. The property holds a valid value only when attached to
2101
90
 * the action visualizing panel defined in \l ListItemStyle::actionsDelegate style
2102
91
 * property.
2103
92
 */
2104
93
UCListItemActions *UCListItemAttached::actions() const
2105
105
{
94
{
2120
106
    if (m_container.isNull()) {
95
    Q_D(const UCListItemAttached);
2121
107
        return;
96
    return d->panel ? d->panel->actions() : 0;
2108
108
    }
2109
109
    QQuickItem *panelItem = UCListItemActionsPrivate::get(m_container)->panelItem;
2110
110
    if (!panelItem || !panelItem->parentItem()) {
2111
111
        return;
2112
112
    }
2113
113
    UCListItem *item = static_cast<UCListItem*>(panelItem->parentItem());
2114
114
    UCListItemPrivate *listItem = UCListItemPrivate::get(item);
2115
115
    bool swiped = listItem->highlighted && listItem->contentMoved;
2116
116
    if (swiped != m_swiping) {
2117
117
        m_swiping = swiped;
2118
118
        Q_EMIT swipingChanged();
2119
119
    }
2122
120
}
97
}
2123
121
98
2124
122
/*!
99
/*!
2126
123
 * \qmlattachedproperty list<Action> ListItemActions::visibleActions
100
 * \qmlattachedproperty list<Action> ListItem::visibleActions
2127
124
 * Holds the list of visible actions. This is a convenience property to help action
101
 * Holds the list of visible actions. This is a convenience property to help action
2129
125
 * visualization panel implementations to consider only visible actions.
102
 * visualization panel implementations to consider only visible actions. Similar to
2130
103
 * \l actions attached property, it is only valid when attached to \l ListItemStyle::actionsDelegate
2131
104
 * component.
2132
126
 */
105
 */
2134
127
QQmlListProperty<UCAction> UCListItemActionsAttached::visibleActions()
106
QQmlListProperty<UCAction> UCListItemAttached::visibleActions()
2135
128
{
107
{
2137
129
    return QQmlListProperty<UCAction>(this, m_visibleActions);
108
    Q_D(UCListItemAttached);
2138
109
    return QQmlListProperty<UCAction>(this, d->visibleActions);
2139
130
}
110
}
2140
131
111
2141
132
/*!
112
/*!
2143
133
 * \qmlattachedproperty ListItem ListItemActions::listItem
113
 * \qmlattachedproperty ListItem ListItem::item
2144
134
 * \readonly
114
 * \readonly
2146
135
 * The property reports the connected \l ListItem to the list of actions.
115
 * The property reports the connected \l ListItem to the panel. Valid in every attachee.
2147
136
 */
116
 */
2149
137
UCListItem *UCListItemActionsAttached::listItem()
117
UCListItem *UCListItemAttached::item()
2150
138
{
118
{
2160
139
    if (m_container.isNull()) {
119
    Q_D(UCListItemAttached);
2161
140
        return NULL;
120
    return d->listItem;
2153
141
    }
2154
142
    QQuickItem *panelItem = UCListItemActionsPrivate::get(m_container)->panelItem;
2155
143
    if (!panelItem) {
2156
144
        return NULL;
2157
145
    }
2158
146
    QQuickItem *listItem = panelItem->parentItem();
2159
147
    return static_cast<UCListItem*>(listItem);
2162
148
}
121
}
2163
149
122
2164
150
/*!
123
/*!
2166
151
 * \qmlattachedproperty int ListItemActions::listItemIndex
124
 * \qmlattachedproperty int ListItem::index
2167
152
 * \readonly
125
 * \readonly
2168
153
 * Holds the index of the \l ListItem within a view, if the \l ListItem is used
126
 * Holds the index of the \l ListItem within a view, if the \l ListItem is used
2210
154
 * in a model driven view. Otherwise it is set to -1.
127
 * in a model driven view, or the child index otherwise. Valid in every attachee.
2211
155
 */
128
 */
2212
156
int UCListItemActionsAttached::listItemIndex() {
129
int UCListItemAttached::index() {
2213
157
    if (m_container.isNull()) {
130
    Q_D(UCListItemAttached);
2214
158
        return -1;
131
    return d->listItem ? UCListItemPrivate::get(d->listItem)->index() : -1;
2215
159
    }
132
}
2216
160
    QQuickItem *panelItem = UCListItemActionsPrivate::get(m_container)->panelItem;
133
2217
161
    if (!panelItem) {
134
/*!
2218
162
        return -1;
135
 * \qmlattachedproperty enum ListItem::panelStatus
2178
163
    }
2179
164
    QQuickItem *listItem = panelItem->parentItem();
2180
165
    return listItem ? UCListItemPrivate::get(static_cast<UCListItem*>(listItem))->index() : -1;
2181
166
}
2182
167
2183
168
/*!
2184
169
 * \qmlattachedproperty bool ListItemActions::swiping
2185
170
 * \readonly
2186
171
 * The property notifies whether the panel is swiped or not. The property does
2187
172
 * not notify the rebounding.
2188
173
 */
2189
174
bool UCListItemActionsAttached::swiping()
2190
175
{
2191
176
    return m_swiping;
2192
177
}
2193
178
2194
179
/*!
2195
180
 * \qmlattachedproperty real ListItemActions::offset
2196
181
 * The property returns the offset the panel item holding the visualized actions
2197
182
 * is visible. This can be used to do different animations on the panel and on
2198
183
 * the action visualizations.
2199
184
 */
2200
185
qreal UCListItemActionsAttached::offset()
2201
186
{
2202
187
    if (m_container.isNull()) {
2203
188
        return 0.0;
2204
189
    }
2205
190
    return UCListItemActionsPrivate::get(m_container)->offsetDragged;
2206
191
}
2207
192
2208
193
/*!
2209
194
 * \qmlattachedproperty enum ListItemActions::status
2219
195
 * \readonly
136
 * \readonly
2220
196
 * The property holds the status of the ListItemActions, whether is connected
137
 * The property holds the status of the ListItemActions, whether is connected
2221
197
 * as leading or as trailing action list to a \l ListItem. Possible valueas are:
138
 * as leading or as trailing action list to a \l ListItem. Possible valueas are:
2222
198
 * \list A
139
 * \list A
2224
199
 *  \li \b Disconnected - default, the actions list is not connected to any \l ListItem
140
 *  \li \b None - default, the actions list is not connected to any \l ListItem
2225
200
 *  \li \b Leading - the actions list is connected as leading list
141
 *  \li \b Leading - the actions list is connected as leading list
2226
201
 *  \li \b Trailing - the actions list is connected as trailing list
142
 *  \li \b Trailing - the actions list is connected as trailing list
2227
202
 * \endlist
143
 * \endlist
2228
144
 * The property is valid only when attached to \l ListItemStyle::actionsDelegate component.
2229
203
 */
145
 */
2231
204
UCListItemActions::Status UCListItemActionsAttached::status()
146
UCListItem::PanelStatus UCListItemAttached::panelStatus()
2232
205
{
147
{
2235
206
    if (m_container.isNull()) {
148
    Q_D(UCListItemAttached);
2236
207
        return UCListItemActions::Disconnected;
149
    if (!d->panel) {
2237
150
        return UCListItem::None;
2238
208
    }
151
    }
2240
209
    return UCListItemActionsPrivate::get(m_container)->status;
152
    return d->panel->panelStatus();
2241
210
}
153
}
2242
211
154
2243
212
/*!
155
/*!
2245
213
 * \qmlattachedmethod void ListItemActions::snapToPosition(real position)
156
 * \qmlattachedmethod void ListItem::snapToPosition(real position)
2246
214
 * The function can be used to perform custom snapping, or to execute rebounding
157
 * The function can be used to perform custom snapping, or to execute rebounding
2247
215
 * and also disconnecting from the connected \l ListItem. This can be achieved by
158
 * and also disconnecting from the connected \l ListItem. This can be achieved by
2249
216
 * calling the function with 0.0 value.
159
 * calling the function with 0.0 value. The slot has effect only when used from
2250
160
 * \l ListItemStyle::actionsDelegate component.
2251
217
 */
161
 */
2253
218
void UCListItemActionsAttached::snapToPosition(qreal position)
162
void UCListItemAttached::snapToPosition(qreal position)
2254
219
{
163
{
2255
164
    UCListItem::PanelStatus itemStatus = panelStatus();
2256
165
    Q_D(UCListItemAttached);
2257
220
    //if it is disconnected, leave (this also includes the case when m_container is null)
166
    //if it is disconnected, leave (this also includes the case when m_container is null)
2273
221
    if (status() == UCListItemActions::Disconnected) {
167
    if (!d->listItem || !d->panel || itemStatus == UCListItem::None) {
2274
222
        return;
168
        return;
2275
223
    }
169
    }
2276
224
    QQuickItem *panelItem = UCListItemActionsPrivate::get(m_container)->panelItem;
170
    UCListItemPrivate *listItem = UCListItemPrivate::get(d->listItem);
2277
225
    if (!panelItem) {
171
    position *= (itemStatus == UCListItem::Leading) ? 1 : -1;
2263
226
        // we don't have the panel created yet
2264
227
        return;
2265
228
    }
2266
229
    UCListItem *item = static_cast<UCListItem*>(panelItem->parentItem());
2267
230
    if (!item) {
2268
231
        // no ListItem attached
2269
232
        return;
2270
233
    }
2271
234
    UCListItemPrivate *listItem = UCListItemPrivate::get(item);
2272
235
    position *= (status() == UCListItemActions::Leading) ? 1 : -1;
2278
236
    if (position == 0.0) {
172
    if (position == 0.0) {
2279
237
        listItem->_q_rebound();
173
        listItem->_q_rebound();
2280
238
    } else {
174
    } else {
2281
@@ -243,5 +179,3 @@
2282
243
        }
179
        }
2283
244
    }
180
    }
2284
245
}
181
}
2285
246
2286
247
2287
248
182
2288
=== modified file 'modules/Ubuntu/Components/plugin/uclistitemstyle.h'
2289
--- modules/Ubuntu/Components/plugin/uclistitemstyle.h	2014-12-01 11:13:10 +0000
2290
+++ modules/Ubuntu/Components/plugin/uclistitemstyle.h	2015-01-16 14:53:38 +0000
2291
@@ -46,7 +46,7 @@
2292
46
    qreal m_swipeOvershoot;
46
    qreal m_swipeOvershoot;
2293
47
47
2294
48
    friend class UCListItemPrivate;
48
    friend class UCListItemPrivate;
2296
49
    friend class UCListItemActionsPrivate;
49
    friend class UCActionPanel;
2297
50
    friend class UCListItemSnapAnimator;
50
    friend class UCListItemSnapAnimator;
2298
51
};
51
};
2299
52
52
2300
53
53
2301
=== renamed file 'modules/Ubuntu/Components/plugin/uclistitemattached.cpp' => 'modules/Ubuntu/Components/plugin/ucviewitemsattached.cpp'
2302
--- modules/Ubuntu/Components/plugin/uclistitemattached.cpp	2014-11-18 15:27:08 +0000
2303
+++ modules/Ubuntu/Components/plugin/ucviewitemsattached.cpp	2015-01-16 14:53:38 +0000
2304
@@ -28,34 +28,34 @@
2305
28
 * in this way the controlling of the interactive flag of the Flickable and all
28
 * in this way the controlling of the interactive flag of the Flickable and all
2306
29
 * its ascendant Flickables.
29
 * its ascendant Flickables.
2307
30
 */
30
 */
2309
31
UCListItemAttachedPrivate::UCListItemAttachedPrivate(UCListItemAttached *qq)
31
UCViewItemsAttachedPrivate::UCViewItemsAttachedPrivate(UCViewItemsAttached *qq)
2310
32
    : q_ptr(qq)
32
    : q_ptr(qq)
2311
33
    , globalDisabled(false)
33
    , globalDisabled(false)
2312
34
{
34
{
2313
35
}
35
}
2314
36
36
2316
37
UCListItemAttachedPrivate::~UCListItemAttachedPrivate()
37
UCViewItemsAttachedPrivate::~UCViewItemsAttachedPrivate()
2317
38
{
38
{
2318
39
    clearChangesList();
39
    clearChangesList();
2319
40
    clearFlickablesList();
40
    clearFlickablesList();
2320
41
}
41
}
2321
42
42
2322
43
// disconnect all flickables
43
// disconnect all flickables
2324
44
void UCListItemAttachedPrivate::clearFlickablesList()
44
void UCViewItemsAttachedPrivate::clearFlickablesList()
2325
45
{
45
{
2327
46
    Q_Q(UCListItemAttached);
46
    Q_Q(UCViewItemsAttached);
2328
47
    Q_FOREACH(const QPointer<QQuickFlickable> &flickable, flickables) {
47
    Q_FOREACH(const QPointer<QQuickFlickable> &flickable, flickables) {
2329
48
        if (flickable.data())
48
        if (flickable.data())
2330
49
        QObject::disconnect(flickable.data(), &QQuickFlickable::movementStarted,
49
        QObject::disconnect(flickable.data(), &QQuickFlickable::movementStarted,
2332
50
                            q, &UCListItemAttached::unbindItem);
50
                            q, &UCViewItemsAttached::unbindItem);
2333
51
    }
51
    }
2334
52
    flickables.clear();
52
    flickables.clear();
2335
53
}
53
}
2336
54
54
2337
55
// connect all flickables
55
// connect all flickables
2339
56
void UCListItemAttachedPrivate::buildFlickablesList()
56
void UCViewItemsAttachedPrivate::buildFlickablesList()
2340
57
{
57
{
2342
58
    Q_Q(UCListItemAttached);
58
    Q_Q(UCViewItemsAttached);
2343
59
    QQuickItem *item = qobject_cast<QQuickItem*>(q->parent());
59
    QQuickItem *item = qobject_cast<QQuickItem*>(q->parent());
2344
60
    if (!item) {
60
    if (!item) {
2345
61
        return;
61
        return;
2346
@@ -65,17 +65,17 @@
2347
65
        QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(item);
65
        QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(item);
2348
66
        if (flickable) {
66
        if (flickable) {
2349
67
            QObject::connect(flickable, &QQuickFlickable::movementStarted,
67
            QObject::connect(flickable, &QQuickFlickable::movementStarted,
2351
68
                             q, &UCListItemAttached::unbindItem);
68
                             q, &UCViewItemsAttached::unbindItem);
2352
69
            flickables << flickable;
69
            flickables << flickable;
2353
70
        }
70
        }
2354
71
        item = item->parentItem();
71
        item = item->parentItem();
2355
72
    }
72
    }
2356
73
}
73
}
2357
74
74
2359
75
void UCListItemAttachedPrivate::clearChangesList()
75
void UCViewItemsAttachedPrivate::clearChangesList()
2360
76
{
76
{
2361
77
    // clear property change objects
77
    // clear property change objects
2363
78
    Q_Q(UCListItemAttached);
78
    Q_Q(UCViewItemsAttached);
2364
79
    Q_FOREACH(PropertyChange *change, changes) {
79
    Q_FOREACH(PropertyChange *change, changes) {
2365
80
        // deleting PropertyChange will restore the saved property
80
        // deleting PropertyChange will restore the saved property
2366
81
        // to its original binding/value
81
        // to its original binding/value
2367
@@ -84,10 +84,10 @@
2368
84
    changes.clear();
84
    changes.clear();
2369
85
}
85
}
2370
86
86
2372
87
void UCListItemAttachedPrivate::buildChangesList(const QVariant &newValue)
87
void UCViewItemsAttachedPrivate::buildChangesList(const QVariant &newValue)
2373
88
{
88
{
2374
89
    // collect all ascendant flickables
89
    // collect all ascendant flickables
2376
90
    Q_Q(UCListItemAttached);
90
    Q_Q(UCViewItemsAttached);
2377
91
    QQuickItem *item = qobject_cast<QQuickItem*>(q->parent());
91
    QQuickItem *item = qobject_cast<QQuickItem*>(q->parent());
2378
92
    if (!item) {
92
    if (!item) {
2379
93
        return;
93
        return;
2380
@@ -104,22 +104,27 @@
2381
104
    }
104
    }
2382
105
}
105
}
2383
106
106
2385
107
UCListItemAttached::UCListItemAttached(QObject *owner)
107
UCViewItemsAttached::UCViewItemsAttached(QObject *owner)
2386
108
    : QObject(owner)
108
    : QObject(owner)
2393
109
    , d_ptr(new UCListItemAttachedPrivate(this))
109
    , d_ptr(new UCViewItemsAttachedPrivate(this))
2394
110
{
110
{
2395
111
}
111
}
2396
112
112
2397
113
UCListItemAttached::~UCListItemAttached()
113
UCViewItemsAttached::~UCViewItemsAttached()
2398
114
{
114
{
2399
115
}
2400
116
2401
117
UCViewItemsAttached *UCViewItemsAttached::qmlAttachedProperties(QObject *owner)
2402
118
{
2403
119
    return new UCViewItemsAttached(owner);
2404
115
}
120
}
2405
116
121
2406
117
// register item to be rebound
122
// register item to be rebound
2408
118
bool UCListItemAttached::listenToRebind(UCListItem *item, bool listen)
123
bool UCViewItemsAttached::listenToRebind(UCListItem *item, bool listen)
2409
119
{
124
{
2410
120
    // we cannot bind the item until we have an other one bound
125
    // we cannot bind the item until we have an other one bound
2411
121
    bool result = false;
126
    bool result = false;
2413
122
    Q_D(UCListItemAttached);
127
    Q_D(UCViewItemsAttached);
2414
123
    if (listen) {
128
    if (listen) {
2415
124
        if (d->boundItem.isNull() || (d->boundItem == item)) {
129
        if (d->boundItem.isNull() || (d->boundItem == item)) {
2416
125
            d->boundItem = item;
130
            d->boundItem = item;
2417
@@ -135,9 +140,9 @@
2418
135
}
140
}
2419
136
141
2420
137
// reports true if any of the ascendant flickables is moving
142
// reports true if any of the ascendant flickables is moving
2422
138
bool UCListItemAttached::isMoving()
143
bool UCViewItemsAttached::isMoving()
2423
139
{
144
{
2425
140
    Q_D(UCListItemAttached);
145
    Q_D(UCViewItemsAttached);
2426
141
    Q_FOREACH(const QPointer<QQuickFlickable> &flickable, d->flickables) {
146
    Q_FOREACH(const QPointer<QQuickFlickable> &flickable, d->flickables) {
2427
142
        if (flickable && flickable->isMoving()) {
147
        if (flickable && flickable->isMoving()) {
2428
143
            return true;
148
            return true;
2429
@@ -147,9 +152,9 @@
2430
147
}
152
}
2431
148
153
2432
149
// returns true if the given ListItem is bound to listen on moving changes
154
// returns true if the given ListItem is bound to listen on moving changes
2434
150
bool UCListItemAttached::isBoundTo(UCListItem *item)
155
bool UCViewItemsAttached::isBoundTo(UCListItem *item)
2435
151
{
156
{
2437
152
    Q_D(UCListItemAttached);
157
    Q_D(UCViewItemsAttached);
2438
153
    return d->boundItem == item;
158
    return d->boundItem == item;
2439
154
}
159
}
2440
155
160
2441
@@ -161,9 +166,9 @@
2442
161
 * When disabled, always the last item disabling will be kept as active disabler,
166
 * When disabled, always the last item disabling will be kept as active disabler,
2443
162
 * and only the active disabler can enable (restore) the interactive flag state.
167
 * and only the active disabler can enable (restore) the interactive flag state.
2444
163
 */
168
 */
2446
164
void UCListItemAttached::disableInteractive(UCListItem *item, bool disable)
169
void UCViewItemsAttached::disableInteractive(UCListItem *item, bool disable)
2447
165
{
170
{
2449
166
    Q_D(UCListItemAttached);
171
    Q_D(UCViewItemsAttached);
2450
167
    if (disable) {
172
    if (disable) {
2451
168
        // disabling or re-disabling
173
        // disabling or re-disabling
2452
169
        d->disablerItem = item;
174
        d->disablerItem = item;
2453
@@ -188,9 +193,9 @@
2454
188
    }
193
    }
2455
189
}
194
}
2456
190
195
2458
191
void UCListItemAttached::unbindItem()
196
void UCViewItemsAttached::unbindItem()
2459
192
{
197
{
2461
193
    Q_D(UCListItemAttached);
198
    Q_D(UCViewItemsAttached);
2462
194
    if (d->boundItem) {
199
    if (d->boundItem) {
2463
195
        // depending on content item's X coordinate, we either do animated or prompt rebind
200
        // depending on content item's X coordinate, we either do animated or prompt rebind
2464
196
        if (d->boundItem->contentItem()->x() != 0.0) {
201
        if (d->boundItem->contentItem()->x() != 0.0) {
2465
197
202
2466
=== modified file 'tests/resources/listitems/ListItemTest.qml'
2467
--- tests/resources/listitems/ListItemTest.qml	2014-12-04 13:23:18 +0000
2468
+++ tests/resources/listitems/ListItemTest.qml	2015-01-16 14:53:38 +0000
2469
@@ -16,6 +16,7 @@
2470
16
16
2471
17
import QtQuick 2.2
17
import QtQuick 2.2
2472
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.2
2473
19
import Ubuntu.Components.Styles 1.2
2474
19
20
2475
20
MainView {
21
MainView {
2476
21
    id: main
22
    id: main
2477
@@ -109,7 +110,7 @@
2478
109
                        width: units.gu(3)
110
                        width: units.gu(3)
2479
110
                        height: width
111
                        height: width
2480
111
                        name: action.iconName
112
                        name: action.iconName
2482
112
                        color: "blue"
113
                        color: pressed ? "blue" : "pink"
2483
113
                        anchors.horizontalCenter: parent.horizontalCenter
114
                        anchors.horizontalCenter: parent.horizontalCenter
2484
114
                    }
115
                    }
2485
115
                    Label {
116
                    Label {
2486
@@ -131,13 +132,16 @@
2487
131
132
2488
132
        ListItem {
133
        ListItem {
2489
133
            Label {
134
            Label {
2490
135
                id: label2
2491
134
                anchors.fill: parent
136
                anchors.fill: parent
2493
135
                text: "Another standalone ListItem"
137
                text: "Another standalone ListItem\nStarted with custom style, reset to theme style on first click"
2494
136
            }
138
            }
2495
137
            leadingActions: testItem.leadingActions
139
            leadingActions: testItem.leadingActions
2496
138
            trailingActions: ListItemActions {
140
            trailingActions: ListItemActions {
2497
139
                actions: leading.actions
141
                actions: leading.actions
2498
140
            }
142
            }
2499
143
            style: ListItemStyle {}
2500
144
            onClicked: { style = undefined; label2.text = "Another standalone ListItem" }
2501
141
        }
145
        }
2502
142
146
2503
143
        ListView {
147
        ListView {
2504
@@ -152,6 +156,7 @@
2505
152
                id: listItem
156
                id: listItem
2506
153
                onClicked: print(" clicked")
157
                onClicked: print(" clicked")
2507
154
                leadingActions: leading
158
                leadingActions: leading
2508
159
                trailingActions: leadingActions
2509
155
                Label {
160
                Label {
2510
156
                    text: modelData + " item"
161
                    text: modelData + " item"
2511
157
                }
162
                }
2512
@@ -179,7 +184,7 @@
2513
179
184
2514
180
            Column {
185
            Column {
2515
181
                id: column
186
                id: column
2517
182
                width: view.width
187
                width: flicker.width
2518
183
                property alias count: repeater.count
188
                property alias count: repeater.count
2519
184
                Repeater {
189
                Repeater {
2520
185
                    id: repeater
190
                    id: repeater
2521
186
191
2522
=== modified file 'tests/unit_x11/tst_components/tst_listitem.qml'
2523
--- tests/unit_x11/tst_components/tst_listitem.qml	2014-12-19 06:32:11 +0000
2524
+++ tests/unit_x11/tst_components/tst_listitem.qml	2015-01-16 14:53:38 +0000
2525
@@ -18,11 +18,12 @@
2526
18
import QtTest 1.0
18
import QtTest 1.0
2527
19
import Ubuntu.Test 1.0
19
import Ubuntu.Test 1.0
2528
20
import Ubuntu.Components 1.2
20
import Ubuntu.Components 1.2
2529
21
import Ubuntu.Components.Styles 1.2
2530
21
22
2531
22
Item {
23
Item {
2532
23
    id: main
24
    id: main
2535
24
    width: units.gu(40)
25
    width: units.gu(50)
2536
25
    height: units.gu(71)
26
    height: units.gu(100)
2537
26
27
2538
27
    Action {
28
    Action {
2539
28
        id: stockAction
29
        id: stockAction
2540
@@ -192,8 +193,8 @@
2541
192
            compare(defaults.highlighted, false, "Not highlighted by default");
193
            compare(defaults.highlighted, false, "Not highlighted by default");
2542
193
            compare(defaults.swipeOvershoot, 0.0, "No overshoot till the style is loaded!");
194
            compare(defaults.swipeOvershoot, 0.0, "No overshoot till the style is loaded!");
2543
194
            compare(defaults.divider.visible, true, "divider is visible by default");
195
            compare(defaults.divider.visible, true, "divider is visible by default");
2546
195
            compare(defaults.divider.leftMargin, units.dp(2), "divider's left margin is 2GU");
196
            compare(defaults.divider.leftMargin, 0, "divider's left margin is 0");
2547
196
            compare(defaults.divider.rightMargin, units.dp(2), "divider's right margin is 2GU");
197
            compare(defaults.divider.rightMargin, 0, "divider's right margin is 0");
2548
197
            compare(defaults.divider.colorFrom, "#000000", "colorFrom differs.");
198
            compare(defaults.divider.colorFrom, "#000000", "colorFrom differs.");
2549
198
            fuzzyCompare(defaults.divider.colorFrom.a, 0.14, 0.01, "colorFrom alpha differs");
199
            fuzzyCompare(defaults.divider.colorFrom.a, 0.14, 0.01, "colorFrom alpha differs");
2550
199
            compare(defaults.divider.colorTo, "#ffffff", "colorTo differs.");
200
            compare(defaults.divider.colorTo, "#ffffff", "colorTo differs.");
2551
@@ -206,6 +207,14 @@
2552
206
            compare(actionsDefault.actions.length, 0, "ListItemActions has no actions set.");
207
            compare(actionsDefault.actions.length, 0, "ListItemActions has no actions set.");
2553
207
        }
208
        }
2554
208
209
2555
210
        Component { id: customStyle; ListItemStyle {} }
2556
211
2557
212
        function test_style_reset() {
2558
213
            testItem.style = customStyle;
2559
214
            testItem.style = undefined;
2560
215
            verify(testItem.style != 0 && testItem.style.objectName == "ListItemThemeStyle", "Style set back to theme");
2561
216
        }
2562
217
2563
209
        function test_children_in_content_item() {
218
        function test_children_in_content_item() {
2564
210
            compare(bodyItem.parent, testItem.contentItem, "Content is not in the right holder!");
219
            compare(bodyItem.parent, testItem.contentItem, "Content is not in the right holder!");
2565
211
        }
220
        }
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-01-19
Tim Peeters		2015-01-07	Approve on 2015-01-19
Review via email: mp+245714@code.launchpad.net