Unity 8

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

properVRangesCurrentScope
Merge into trunk

Proposed by Albert Astals Cid on 2015-01-14

Status:

Merged

Approved by:

Andrea Cimitan on 2015-02-20

Approved revision:

1550

Merged at revision:

1641

Proposed branch:

lp:~aacid/unity8/properVRangesCurrentScope

Merge into:

lp:unity8

Prerequisite:

lp:~aacid/unity8/properRangesHorizontalCategories

Diff against target:

49 lines (+11/-7)

1 file modified

qml/Dash/GenericScopeView.qml (+11/-7)

To merge this branch:

bzr merge lp:~aacid/unity8/properVRangesCurrentScope

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2015-02-24
Andrea Cimitan (community)			Approve on 2015-02-20
Michał Sawicz		2015-01-14	Pending
Review via email: mp+246465@code.launchpad.net

Commit message

Don't precache items that are outisde the 1.5*height buffering area

Description of the change

* Are there any related MPs required for this MP to build/function as expected?
Prerequisite

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* Did you make sure that your branch does not contain spurious tags?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

* If you changed the UI, has there been a design review?
N/A

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-14:

FAILED: Continuous integration, rev:1548
http://jenkins.qa.ubuntu.com/job/unity8-ci/5148/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/807
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/312
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/313
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/313
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/702
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/805
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/805/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17081

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/properVRangesCurrentScope updated on 2015-01-15

1549. By Albert Astals Cid on 2015-01-15: Merge again

Revision history for this message

Albert Astals Cid (aacid) wrote on 2015-01-15:

qmluitest fixed with the merge of 1549

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-15:

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

review: Approve (continuous-integration)

lp:~aacid/unity8/properVRangesCurrentScope updated on 2015-02-09

1550. By Albert Astals Cid on 2015-02-09: Merge

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-09:

PASSED: Continuous integration, rev:1550
http://jenkins.qa.ubuntu.com/job/unity8-ci/5259/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/423
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/424
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/424
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1246
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1246/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17885

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

review: Approve (continuous-integration)

Revision history for this message

Andrea Cimitan (cimi) wrote on 2015-02-20:

* Did you perform an exploratory manual test run of the code change and any related functionality?
yes
* Did CI run pass? If not, please explain why.
yes
* Did you make sure that the branch does not contain spurious tags?
yes

review: Approve

lp:~aacid/unity8/properVRangesCurrentScope updated on 2015-02-24

1551. By Albert Astals Cid on 2015-02-24: Merge

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-24:

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Albert Astals Cid

Mohammad Rakibul Hasan

Unity Team

1	=== modified file 'qml/Dash/GenericScopeView.qml'
2	--- qml/Dash/GenericScopeView.qml 2015-02-11 17:10:44 +0000
3	+++ qml/Dash/GenericScopeView.qml 2015-02-24 14:43:54 +0000
4	@@ -401,6 +401,12 @@
5	}
6
7	if (item && item.hasOwnProperty("displayMarginBeginning")) {
8	+ var buffer = wasCurrentOnMoveStart ? categoryView.height * 1.5 : 0;
9	+ var onViewport = baseItem.y + baseItem.height > 0 &&
10	+ baseItem.y < categoryView.height;
11	+ var onBufferViewport = baseItem.y + baseItem.height > -buffer &&
12	+ baseItem.y < categoryView.height + buffer;
13	+
14	if (item.growsVertically) {
15	// A item view creates its delegates synchronously from
16	// -displayMarginBeginning
17	@@ -428,7 +434,7 @@
18	displayMarginEnd = -Math.min(-displayMarginEnd, baseItem.height);
19	displayMarginEnd = Math.round(displayMarginEnd);
20
21	- if (scopeView.isCurrent \|\| scopeView.visibleToParent) {
22	+ if (onBufferViewport && (scopeView.isCurrent \|\| scopeView.visibleToParent)) {
23	item.displayMarginBeginning = displayMarginBeginning;
24	item.displayMarginEnd = displayMarginEnd;
25	if (holdingList && holdingList.moving) {
26	@@ -441,7 +447,10 @@
27	item.cacheBuffer = 0;
28	}
29	} else {
30	- item.cacheBuffer = categoryView.height * 1.5;
31	+ // Protect us against cases where the item hasn't yet been positioned
32	+ if (!(categoryView.contentY === 0 && baseItem.y === 0 && index !== 0)) {
33	+ item.cacheBuffer = categoryView.height * 1.5;
34	+ }
35	}
36	} else {
37	var visibleRange = baseItem.height + displayMarginEnd + displayMarginBeginning;
38	@@ -459,11 +468,6 @@
39	}
40	}
41	} else {
42	- var buffer = wasCurrentOnMoveStart ? categoryView.height * 1.5 : 0;
43	- var onViewport = baseItem.y + baseItem.height > 0 &&
44	- baseItem.y < categoryView.height;
45	- var onBufferViewport = baseItem.y + baseItem.height > -buffer &&
46	- baseItem.y < categoryView.height + buffer;
47	if (!onBufferViewport) {
48	// If not on the buffered viewport, don't load anything
49	item.displayMarginBeginning = 0;