1
=== modified file 'plugins/ListViewWithPageHeader/listviewwithpageheader.cpp'
2
--- plugins/ListViewWithPageHeader/listviewwithpageheader.cpp	2013-10-03 11:48:24 +0000
3
+++ plugins/ListViewWithPageHeader/listviewwithpageheader.cpp	2013-11-04 12:34:19 +0000
4
@@ -155,6 +155,7 @@
5
155
 , m_topSectionItem(nullptr)
155
 , m_topSectionItem(nullptr)
6
156
 , m_forceNoClip(false)
156
 , m_forceNoClip(false)
7
157
 , m_inLayout(false)
157
 , m_inLayout(false)
8
158
 , m_inContentHeightKeepHeaderShown(false)
9
158
{
159
{
10
159
    m_clipItem = new QQuickItem(contentItem());
160
    m_clipItem = new QQuickItem(contentItem());
11
160
//     m_clipItem = new QQuickRectangle(contentItem());
161
//     m_clipItem = new QQuickRectangle(contentItem());
12
@@ -494,7 +495,7 @@
13
494
            if (!scrolledUp && contentY() == -m_minYExtent) {
495
            if (!scrolledUp && contentY() == -m_minYExtent) {
14
495
                m_headerItemShownHeight = 0;
496
                m_headerItemShownHeight = 0;
15
496
                m_headerItem->setY(contentY());
497
                m_headerItem->setY(contentY());
17
497
            } else if ((scrolledUp && notRebounding && notShownByItsOwn && !maximizeVisibleAreaRunning) || (m_headerItemShownHeight > 0)) {
498
            } else if ((scrolledUp && notRebounding && notShownByItsOwn && !maximizeVisibleAreaRunning) || (m_headerItemShownHeight > 0) || m_inContentHeightKeepHeaderShown) {
18
498
                if (maximizeVisibleAreaRunning && diff > 0) // If we are maximizing and the header was shown, make sure we hide it
499
                if (maximizeVisibleAreaRunning && diff > 0) // If we are maximizing and the header was shown, make sure we hide it
19
499
                    m_headerItemShownHeight -= diff;
500
                    m_headerItemShownHeight -= diff;
20
500
                else
501
                else
21
@@ -1267,7 +1268,9 @@
22
1267
1268
23
1268
        m_contentHeightDirty = false;
1269
        m_contentHeightDirty = false;
24
1269
        adjustMinYExtent();
1270
        adjustMinYExtent();
25
1271
        m_inContentHeightKeepHeaderShown = m_headerItem && m_headerItem->y() == contentY();
26
1270
        setContentHeight(contentHeight);
1272
        setContentHeight(contentHeight);
27
1273
        m_inContentHeightKeepHeaderShown = false;
28
1271
    }
1274
    }
29
1272
}
1275
}
30
1273
1276
31
1274
1277
32
=== modified file 'plugins/ListViewWithPageHeader/listviewwithpageheader.h'
33
--- plugins/ListViewWithPageHeader/listviewwithpageheader.h	2013-09-02 13:22:33 +0000
34
+++ plugins/ListViewWithPageHeader/listviewwithpageheader.h	2013-11-04 12:34:19 +0000
35
@@ -202,6 +202,7 @@
36
202
202
37
203
    bool m_forceNoClip;
203
    bool m_forceNoClip;
38
204
    bool m_inLayout;
204
    bool m_inLayout;
39
205
    bool m_inContentHeightKeepHeaderShown;
40
205
206
41
206
    // Qt 5.0 doesn't like releasing the items just after itemCreated
207
    // Qt 5.0 doesn't like releasing the items just after itemCreated
42
207
    // so we delay the releasing until the next updatePolish
208
    // so we delay the releasing until the next updatePolish
43
208
209
44
=== modified file 'tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp'
45
--- tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp	2013-10-02 13:20:56 +0000
46
+++ tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp	2013-11-04 12:34:19 +0000
47
@@ -1824,6 +1824,23 @@
48
1824
        lvwph->positionAtBeginning();
1824
        lvwph->positionAtBeginning();
49
1825
    }
1825
    }
50
1826
1826
51
1827
    void testHeaderPositionBug1240118()
52
1828
    {
53
1829
        scrollToBottom();
54
1830
        lvwph->showHeader();
55
1831
        QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());
56
1832
        QTest::qWait(100); // Make sure stuff is stable
57
1833
        QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 100));
58
1834
        model->setProperty(3, "size", 10);
59
1835
        model->setProperty(4, "size", 10);
60
1836
        model->setProperty(5, "size", 10);
61
1837
        model->setProperty(6, "size", 10);
62
1838
#if (QT_VERSION > QT_VERSION_CHECK(5, 0, 3))
63
1839
        QTRY_COMPARE(lvwph->m_minYExtent, 210.);
64
1840
#endif
65
1841
        QTRY_COMPARE(lvwph->m_headerItem->y(), -lvwph->m_minYExtent);
66
1842
    }
67
1843
68
1827
private:
1844
private:
69
1828
    QQuickView *view;
1845
    QQuickView *view;
70
1829
    ListViewWithPageHeader *lvwph;
1846
    ListViewWithPageHeader *lvwph;
Reviewer	Review Type	Date Requested	Status
Nick Dedekind (community)		2013-10-30	Approve on 2013-11-13
PS Jenkins bot (community)	continuous-integration		Approve on 2013-11-04
Michal Hruby (community)		2013-10-30	Approve on 2013-10-31
Review via email: mp+193200@code.launchpad.net