1
=== modified file 'plugins/Dash/abstractdashview.cpp'
2
--- plugins/Dash/abstractdashview.cpp	2015-08-19 13:56:21 +0000
3
+++ plugins/Dash/abstractdashview.cpp	2016-06-29 09:16:21 +0000
4
@@ -228,13 +228,24 @@
5
228
    return changed;
228
    return changed;
6
229
}
229
}
7
230
230
8
231
// TODO Use qEnvironmentVariableIntValue when Qt minimum version is 5.5
9
232
static const int create_item_threshold_warning = qgetenv("U8_DASH_CREATE_ITEM_WARNING_THRESHOLD").toInt();
10
233
11
231
QQuickItem *AbstractDashView::createItem(int modelIndex, bool asynchronous)
234
QQuickItem *AbstractDashView::createItem(int modelIndex, bool asynchronous)
12
232
{
235
{
13
233
    if (asynchronous && m_asyncRequestedIndex != -1)
236
    if (asynchronous && m_asyncRequestedIndex != -1)
14
234
        return nullptr;
237
        return nullptr;
15
235
238
16
239
    QElapsedTimer timer;
17
240
    if (Q_UNLIKELY(create_item_threshold_warning > 0)) {
18
241
        timer.start();
19
242
    }
20
243
21
236
    m_asyncRequestedIndex = -1;
244
    m_asyncRequestedIndex = -1;
22
237
    QObject* object = m_delegateModel->object(modelIndex, asynchronous);
245
    QObject* object = m_delegateModel->object(modelIndex, asynchronous);
23
246
    if (Q_UNLIKELY(create_item_threshold_warning > 0 && timer.elapsed() >= create_item_threshold_warning)) {
24
247
        qDebug() << "AbstractDashView::createItem for" << object << "in" << this << "took" << timer.elapsed() << "ms";
25
248
    }
26
238
    QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
249
    QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
27
239
    if (!item) {
250
    if (!item) {
28
240
        if (object) {
251
        if (object) {
29
241
252
30
=== modified file 'plugins/Dash/listviewwithpageheader.cpp'
31
--- plugins/Dash/listviewwithpageheader.cpp	2016-06-17 01:15:42 +0000
32
+++ plugins/Dash/listviewwithpageheader.cpp	2016-06-29 09:16:21 +0000
33
@@ -860,14 +860,25 @@
34
860
    return changed;
860
    return changed;
35
861
}
861
}
36
862
862
37
863
// TODO Use qEnvironmentVariableIntValue when Qt minimum version is 5.5
38
864
static const int create_item_threshold_warning = qgetenv("U8_DASH_CREATE_ITEM_WARNING_THRESHOLD").toInt();
39
865
40
863
ListViewWithPageHeader::ListItem *ListViewWithPageHeader::createItem(int modelIndex, bool asynchronous)
866
ListViewWithPageHeader::ListItem *ListViewWithPageHeader::createItem(int modelIndex, bool asynchronous)
41
864
{
867
{
42
865
//     qDebug() << "CREATE ITEM" << modelIndex;
868
//     qDebug() << "CREATE ITEM" << modelIndex;
43
866
    if (asynchronous && m_asyncRequestedIndex != -1)
869
    if (asynchronous && m_asyncRequestedIndex != -1)
44
867
        return nullptr;
870
        return nullptr;
45
868
871
46
872
    QElapsedTimer timer;
47
873
    if (Q_UNLIKELY(create_item_threshold_warning > 0)) {
48
874
        timer.start();
49
875
    }
50
876
51
869
    m_asyncRequestedIndex = -1;
877
    m_asyncRequestedIndex = -1;
52
870
    QObject* object = m_delegateModel->object(modelIndex, asynchronous);
878
    QObject* object = m_delegateModel->object(modelIndex, asynchronous);
53
879
    if (Q_UNLIKELY(create_item_threshold_warning > 0 && timer.elapsed() >= create_item_threshold_warning)) {
54
880
        qDebug() << "ListViewWithPageHeader::createItem for" << object << "in" << this << "took" << timer.elapsed() << "ms";
55
881
    }
56
871
    QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
882
    QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
57
872
    if (!item) {
883
    if (!item) {
58
873
        if (object) {
884
        if (object) {
Status:	Work in progress
Proposed branch:	lp:~aacid/unity8/add_create_item_debug_envvar
Merge into:	lp:unity8
Diff against target:	58 lines (+22/-0) 2 files modified plugins/Dash/abstractdashview.cpp (+11/-0) plugins/Dash/listviewwithpageheader.cpp (+11/-0)
To merge this branch:	bzr merge lp:~aacid/unity8/add_create_item_debug_envvar
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-06-29
Josh Arenson		2016-06-29	Pending
Review via email: mp+298605@code.launchpad.net