Unity 8

Merge lp:~aacid/unity8/lvwph_culling_off_by_one into lp:unity8

  1. lvwph_culling_off_by_one
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 165
Merged at revision: 166
Proposed branch: lp:~aacid/unity8/lvwph_culling_off_by_one
Merge into: lp:unity8
Diff against target: 82 lines (+41/-2)
3 files modified
plugins/ListViewWithPageHeader/listviewwithpageheader.cpp (+2/-2)
tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp (+19/-0)
tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp (+20/-0)
To merge this branch: bzr merge lp:~aacid/unity8/lvwph_culling_off_by_one
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Gerry Boland (community) Approve
Review via email: mp+178689@code.launchpad.net

Commit message

Fix off by one in the culling condition

If you are on 0 and your height is 1 and viewport starts at 1 you have to be culled since you are not visible

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:165
http://jenkins.qa.ubuntu.com/job/unity8-ci/496/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1902
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/918
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/497
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/497/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/496
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1908
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1908/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1626

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/496/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:165
http://jenkins.qa.ubuntu.com/job/unity8-ci/497/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1906
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/919
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/498
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/498/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/497
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1911
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1911/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1627

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/497/rebuild

review: Approve (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/163/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/1250
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1911
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/921
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/162
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/162/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/163
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1916
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1916/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1632

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/ListViewWithPageHeader/listviewwithpageheader.cpp'
2--- plugins/ListViewWithPageHeader/listviewwithpageheader.cpp 2013-08-02 08:52:54 +0000
3+++ plugins/ListViewWithPageHeader/listviewwithpageheader.cpp 2013-08-06 08:29:29 +0000
4@@ -734,7 +734,7 @@
5 releaseItem(listItem);
6 listItem = nullptr;
7 } else {
8- listItem->setCulled(listItem->y() + listItem->height() + m_clipItem->y() < contentY() || listItem->y() + m_clipItem->y() >= contentY() + height());
9+ listItem->setCulled(listItem->y() + listItem->height() + m_clipItem->y() <= contentY() || listItem->y() + m_clipItem->y() >= contentY() + height());
10 if (m_visibleItems.isEmpty()) {
11 m_visibleItems << listItem;
12 } else {
13@@ -1040,7 +1040,7 @@
14 int firstReallyVisibleItem = -1;
15 int modelIndex = m_firstVisibleIndex;
16 Q_FOREACH(ListItem *item, m_visibleItems) {
17- const bool cull = pos + item->height() < visibleFrom || pos >= visibleTo;
18+ const bool cull = pos + item->height() <= visibleFrom || pos >= visibleTo;
19 item->setCulled(cull);
20 item->setY(pos);
21 if (!cull && firstReallyVisibleItem == -1) {
22
23=== modified file 'tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp'
24--- tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp 2013-07-29 11:31:31 +0000
25+++ tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp 2013-08-06 08:29:29 +0000
26@@ -1390,6 +1390,25 @@
27 lvwph->showHeader();
28 }
29
30+ void testCullOnBottomEdge()
31+ {
32+ changeContentY(200);
33+
34+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);
35+ QCOMPARE(lvwph->m_firstVisibleIndex, 0);
36+ verifyItem(0, -150., 150., true);
37+ verifyItem(1, 0., 200., false);
38+ verifyItem(2, 200., 350., false);
39+ verifyItem(3, 550., 350., true);
40+ QCOMPARE(lvwph->m_minYExtent, 0.);
41+ QCOMPARE(lvwph->m_clipItem->y(), 200.);
42+ QCOMPARE(lvwph->m_clipItem->clip(), false);
43+ QCOMPARE(lvwph->m_headerItem->y(), 0.);
44+ QCOMPARE(lvwph->m_headerItem->height(), 50.);
45+ QCOMPARE(lvwph->contentY(), 200.);
46+ QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
47+ }
48+
49 private:
50 QQuickView *view;
51 ListViewWithPageHeader *lvwph;
52
53=== modified file 'tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp'
54--- tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp 2013-08-02 08:52:54 +0000
55+++ tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp 2013-08-06 08:29:29 +0000
56@@ -1691,6 +1691,26 @@
57 QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
58 }
59
60+ void testCullOnBottomEdge()
61+ {
62+ changeContentY(240);
63+
64+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);
65+ QCOMPARE(lvwph->m_firstVisibleIndex, 0);
66+ verifyItem(0, -190., 190., true, "Agressive", true);
67+ verifyItem(1, 0., 240., false, "Regular", false);
68+ verifyItem(2, 240., 390., false, "Mild", false);
69+ verifyItem(3, 630., 390., true, "Bold", true);
70+ QCOMPARE(lvwph->m_minYExtent, 0.);
71+ QCOMPARE(lvwph->m_clipItem->y(), 240.);
72+ QCOMPARE(lvwph->m_clipItem->clip(), false);
73+ QCOMPARE(lvwph->m_headerItem->y(), 0.);
74+ QCOMPARE(lvwph->m_headerItem->height(), 50.);
75+ QCOMPARE(lvwph->contentY(), 240.);
76+ QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
77+ QVERIFY(QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled);
78+ }
79+
80 private:
81 QQuickView *view;
82 ListViewWithPageHeader *lvwph;

Subscribers

People subscribed via source and target branches