1
=== modified file 'plugins/Dash/listviewwithpageheader.cpp'
2
--- plugins/Dash/listviewwithpageheader.cpp	2016-09-08 13:57:38 +0000
3
+++ plugins/Dash/listviewwithpageheader.cpp	2016-09-08 13:57:38 +0000
4
@@ -1392,10 +1392,6 @@
5
1392
1392
6
1393
        m_contentHeightDirty = false;
1393
        m_contentHeightDirty = false;
7
1394
        adjustMinYExtent();
1394
        adjustMinYExtent();
8
1395
        if (contentHeight + m_minYExtent < height()) {
9
1396
            // need this since in the previous call to adjustMinYExtent contentHeight is not set yet
10
1397
            m_minYExtent = 0;
11
1398
        }
12
1399
        m_inContentHeightKeepHeaderShown = m_headerItem && m_headerItem->y() == contentY();
1395
        m_inContentHeightKeepHeaderShown = m_headerItem && m_headerItem->y() == contentY();
13
1400
        setContentHeight(contentHeight);
1396
        setContentHeight(contentHeight);
14
1401
        m_inContentHeightKeepHeaderShown = false;
1397
        m_inContentHeightKeepHeaderShown = false;
15
1402
1398
16
=== modified file 'tests/plugins/Dash/listviewwithpageheadertest.cpp'
17
--- tests/plugins/Dash/listviewwithpageheadertest.cpp	2016-09-08 13:57:38 +0000
18
+++ tests/plugins/Dash/listviewwithpageheadertest.cpp	2016-09-08 13:57:38 +0000
19
@@ -2008,6 +2008,22 @@
20
2008
        QTRY_COMPARE(lvwph->m_minYExtent, 610.);
2008
        QTRY_COMPARE(lvwph->m_minYExtent, 610.);
21
2009
    }
2009
    }
22
2010
2010
23
2011
    void testRemoveItemCutContents()
24
2012
    {
25
2013
        view->rootObject()->setHeight(921);
26
2014
        QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 6));
27
2015
        QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 1000));
28
2016
        QTRY_COMPARE(lvwph->m_visibleItems.count(), 1);
29
2017
        QTRY_COMPARE(lvwph->contentHeight(), 1050.);
30
2018
        scrollToBottom();
31
2019
        QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 530));
32
2020
        QTRY_COMPARE(lvwph->m_visibleItems.count(), 2);
33
2021
        QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 1), Q_ARG(QVariant, 1));
34
2022
        QTRY_COMPARE(lvwph->m_visibleItems.count(), 1);
35
2023
        verifyItem(0, 50., 530., false);
36
2024
        QTRY_COMPARE(lvwph->m_minYExtent, 530.);
37
2025
    }
38
2026
39
2011
private:
2027
private:
40
2012
    QQuickView *view;
2028
    QQuickView *view;
41
2013
    ListViewWithPageHeader *lvwph;
2029
    ListViewWithPageHeader *lvwph;
Status:	Merged
Approved by:	Michał Sawicz on 2016-09-09
Approved revision:	2556
Merged at revision:	2622
Proposed branch:	lp:~aacid/unity8/fixLVWPHItemsCutTop
Merge into:	lp:unity8
Prerequisite:	lp:~aacid/unity8/fixLVWPHRemoveItemShowHeader
Diff against target:	41 lines (+16/-4) 2 files modified plugins/Dash/listviewwithpageheader.cpp (+0/-4) tests/plugins/Dash/listviewwithpageheadertest.cpp (+16/-0)
To merge this branch:	bzr merge lp:~aacid/unity8/fixLVWPHItemsCutTop
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michał Sawicz			Abstain on 2016-09-09
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-09-09
Josh Arenson		2016-08-04	Approve on 2016-08-23
Review via email: mp+302044@code.launchpad.net