Unity 8

Merge lp:~cimi/unity8/lp1350891_ScrollBackground into lp:unity8

  1. lp1350891_ScrollBackground
  2. Merge into trunk
Proposed by Andrea Cimitan
Status: Rejected
Rejected by: Andrea Cimitan
Proposed branch: lp:~cimi/unity8/lp1350891_ScrollBackground
Merge into: lp:unity8
Diff against target: 89 lines (+11/-11)
4 files modified
qml/Dash/Dash.qml (+0/-5)
qml/Dash/DashBackground.qml (+4/-2)
qml/Dash/DashContent.qml (+0/-4)
qml/Dash/GenericScopeView.qml (+7/-0)
To merge this branch: bzr merge lp:~cimi/unity8/lp1350891_ScrollBackground
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Disapprove
Albert Astals Cid (community) Abstain
PS Jenkins bot (community) continuous-integration Needs Fixing
Gerry Boland Pending
Review via email: mp+255810@code.launchpad.net

This proposal supersedes a proposal from 2015-02-17.

Description of the change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
None
 * 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?
Need review.

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

FAILED: Continuous integration, rev:1436
http://jenkins.qa.ubuntu.com/job/unity8-ci/5329/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1390
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/493/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/494
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/494
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1388
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1388/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18111

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1437
http://jenkins.qa.ubuntu.com/job/unity8-ci/5334/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1400
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/498
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/499
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/499
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1398
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1398/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18127

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote : Posted in a previous version of this proposal

Looks like we will have one big image per each scope doing this way, wouldn't be better to have one single DashBackground somewhere in Dash.qml or where it could be static and not change? Would it be possible?

review: Needs Information
Revision history for this message
Gerry Boland (gerboland) wrote : Posted in a previous version of this proposal

Qt is smart enough to cache the image, as long as its source size remains unchanged in the different instances, so there won't be duplication there.

Problems I see:
1. sourceSize is not being set on the image. This means Qt will upload the decoded RGB data to the GPU at the size of the image, and the GPU will have to scale it down to the screen resolution for _every_ frame. Please set the image sourceSize.

Also ensure the calculation is correct first time. If you make it a binding and the sourceSize changes, Qt will re-read the JPG and rescale it on the CPU - which destroys performance horribly.

2. When the sourceSize is set, the CPU has to read the JPG file and scale the image down to the sourceSize requested (about the screen resolution). For Kryllin, that's scaling 1080x1920 down to 540x960, which is a lot of work. Suspect would be better to supply a couple of pre-scaled images which Qt can choose from. Else we need mechanism to scale the image once and cache it somewhere for all future uses.

2. Why JPEG? it's a lossy format. PNG would be more visually accurate (but does have an alpha channel unlike JPEG, so may actually perform worse. Worth testing)

3. You should remove the unused images from the repo

4. There's a DashBackground in Dash.qml too, is it necessary now?

5. + id: colorBackground
necessary?

Please carefully ensure graphical performance is not impact by this change.

review: Needs Fixing
Revision history for this message
Ying-Chun Liu (paulliu) wrote : Posted in a previous version of this proposal

ok. I'll write a test case doing the scrolling.
And compare the user time diff before/after the patch.

Revision history for this message
Albert Astals Cid (aacid) wrote : Posted in a previous version of this proposal

You have bad tags, please run strip-tags.py

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1437
http://jenkins.qa.ubuntu.com/job/unity8-ci/5458/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1855
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/622
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/623
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/623
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1638
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1853
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1853/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18980

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

review: Needs Fixing (continuous-integration)
lp:~cimi/unity8/lp1350891_ScrollBackground updated
1440. By Andrea Cimitan

Removed colorBackground id

1441. By Andrea Cimitan

Show paper bg when colorBg is default or transparent

1442. By Andrea Cimitan

Added scaled versions

1443. By Andrea Cimitan

File renames

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1441
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cimi/unity8/lp1350891_ScrollBackground/+merge/255810/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/5531/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2182
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/694
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/696
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/696
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1920
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2180
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2180/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19539

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

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

FAILED: Continuous integration, rev:1443
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cimi/unity8/lp1350891_ScrollBackground/+merge/255810/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/5534/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2185/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/697
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/699
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/699
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1921/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2183
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2183/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19542

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Tags have been fixed

review: Abstain
Revision history for this message
Andrea Cimitan (cimi) wrote :

Design just told me they change plans and background is fixed

review: Disapprove

Unmerged revisions

1443. By Andrea Cimitan

File renames

1442. By Andrea Cimitan

Added scaled versions

1441. By Andrea Cimitan

Show paper bg when colorBg is default or transparent

1440. By Andrea Cimitan

Removed colorBackground id

1439. By Andrea Cimitan

Deleted old assets

1438. By Andrea Cimitan

Merged trunk, minor changes

1437. By Ying-Chun Liu

Remove old DashBackground.

1436. By Ying-Chun Liu

Add suru background

1435. By Ying-Chun Liu

Merge trunk

1434. By Ying-Chun Liu

merge trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml 2015-02-17 08:26:20 +0000
+++ qml/Dash/Dash.qml 2015-04-10 12:17:44 +0000
@@ -197,11 +197,6 @@
197 }197 }
198 }198 }
199199
200 DashBackground {
201 anchors.fill: scopeItem
202 visible: scopeItem.visible
203 }
204
205 GenericScopeView {200 GenericScopeView {
206 id: scopeItem201 id: scopeItem
207 objectName: "dashTempScopeItem"202 objectName: "dashTempScopeItem"
208203
=== modified file 'qml/Dash/DashBackground.qml'
--- qml/Dash/DashBackground.qml 2014-07-15 15:39:55 +0000
+++ qml/Dash/DashBackground.qml 2015-04-10 12:17:44 +0000
@@ -17,8 +17,10 @@
17import QtQuick 2.017import QtQuick 2.0
1818
19Image {19Image {
20 source: anchors.fill.width > anchors.fill.height ? "graphics/paper_landscape.png" : "graphics/paper_portrait.png"20 source: anchors.fill.width > anchors.fill.height ? "graphics/suru_scope_landscape.jpg" : "graphics/suru_scope_portrait.jpg"
21 fillMode: Image.PreserveAspectCrop21 fillMode: Image.TileVertically
22 horizontalAlignment: Image.AlignRight22 horizontalAlignment: Image.AlignRight
23 verticalAlignment: Image.AlignTop23 verticalAlignment: Image.AlignTop
24 sourceSize.width: anchors.fill.width
25 sourceSize.height: 0
24}26}
2527
=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml 2015-01-16 14:40:52 +0000
+++ qml/Dash/DashContent.qml 2015-04-10 12:17:44 +0000
@@ -103,10 +103,6 @@
103103
104 anchors.fill: parent104 anchors.fill: parent
105105
106 DashBackground {
107 anchors.fill: parent
108 }
109
110 ListView {106 ListView {
111 id: dashContentList107 id: dashContentList
112 objectName: "dashContentList"108 objectName: "dashContentList"
113109
=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml 2015-03-13 10:07:57 +0000
+++ qml/Dash/GenericScopeView.qml 2015-04-10 12:17:44 +0000
@@ -157,6 +157,7 @@
157 }157 }
158158
159 Rectangle {159 Rectangle {
160 id: colorBackground
160 anchors.fill: parent161 anchors.fill: parent
161 color: scopeView.scopeStyle ? scopeView.scopeStyle.background : "transparent"162 color: scopeView.scopeStyle ? scopeView.scopeStyle.background : "transparent"
162 visible: color != "transparent"163 visible: color != "transparent"
@@ -567,6 +568,12 @@
567 }568 }
568 }569 }
569570
571 DashBackground {
572 anchors.fill: parent
573 visible: !colorBackground.visible || colorBackground.color == "#f5f5f5"
574 z: -1
575 }
576
570 sectionProperty: "name"577 sectionProperty: "name"
571 sectionDelegate: ListItems.Header {578 sectionDelegate: ListItems.Header {
572 objectName: "dashSectionHeader" + (delegate ? delegate.category : "")579 objectName: "dashSectionHeader" + (delegate ? delegate.category : "")
573580
=== removed file 'qml/Dash/graphics/paper_landscape@27.png'
574Binary files qml/Dash/graphics/paper_landscape@27.png 2014-01-31 18:46:50 +0000 and qml/Dash/graphics/paper_landscape@27.png 1970-01-01 00:00:00 +0000 differ581Binary files qml/Dash/graphics/paper_landscape@27.png 2014-01-31 18:46:50 +0000 and qml/Dash/graphics/paper_landscape@27.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'qml/Dash/graphics/paper_portrait@27.png'
575Binary files qml/Dash/graphics/paper_portrait@27.png 2014-01-31 18:46:50 +0000 and qml/Dash/graphics/paper_portrait@27.png 1970-01-01 00:00:00 +0000 differ582Binary files qml/Dash/graphics/paper_portrait@27.png 2014-01-31 18:46:50 +0000 and qml/Dash/graphics/paper_portrait@27.png 1970-01-01 00:00:00 +0000 differ
=== added file 'qml/Dash/graphics/suru_scope_landscape@13.jpg'
576Binary files qml/Dash/graphics/suru_scope_landscape@13.jpg 1970-01-01 00:00:00 +0000 and qml/Dash/graphics/suru_scope_landscape@13.jpg 2015-04-10 12:17:44 +0000 differ583Binary files qml/Dash/graphics/suru_scope_landscape@13.jpg 1970-01-01 00:00:00 +0000 and qml/Dash/graphics/suru_scope_landscape@13.jpg 2015-04-10 12:17:44 +0000 differ
=== added file 'qml/Dash/graphics/suru_scope_landscape@18.jpg'
577Binary files qml/Dash/graphics/suru_scope_landscape@18.jpg 1970-01-01 00:00:00 +0000 and qml/Dash/graphics/suru_scope_landscape@18.jpg 2015-04-10 12:17:44 +0000 differ584Binary files qml/Dash/graphics/suru_scope_landscape@18.jpg 1970-01-01 00:00:00 +0000 and qml/Dash/graphics/suru_scope_landscape@18.jpg 2015-04-10 12:17:44 +0000 differ
=== added file 'qml/Dash/graphics/suru_scope_landscape@27.jpg'
578Binary files qml/Dash/graphics/suru_scope_landscape@27.jpg 1970-01-01 00:00:00 +0000 and qml/Dash/graphics/suru_scope_landscape@27.jpg 2015-04-10 12:17:44 +0000 differ585Binary files qml/Dash/graphics/suru_scope_landscape@27.jpg 1970-01-01 00:00:00 +0000 and qml/Dash/graphics/suru_scope_landscape@27.jpg 2015-04-10 12:17:44 +0000 differ
=== added file 'qml/Dash/graphics/suru_scope_portrait@13.jpg'
579Binary files qml/Dash/graphics/suru_scope_portrait@13.jpg 1970-01-01 00:00:00 +0000 and qml/Dash/graphics/suru_scope_portrait@13.jpg 2015-04-10 12:17:44 +0000 differ586Binary files qml/Dash/graphics/suru_scope_portrait@13.jpg 1970-01-01 00:00:00 +0000 and qml/Dash/graphics/suru_scope_portrait@13.jpg 2015-04-10 12:17:44 +0000 differ
=== added file 'qml/Dash/graphics/suru_scope_portrait@18.jpg'
580Binary files qml/Dash/graphics/suru_scope_portrait@18.jpg 1970-01-01 00:00:00 +0000 and qml/Dash/graphics/suru_scope_portrait@18.jpg 2015-04-10 12:17:44 +0000 differ587Binary files qml/Dash/graphics/suru_scope_portrait@18.jpg 1970-01-01 00:00:00 +0000 and qml/Dash/graphics/suru_scope_portrait@18.jpg 2015-04-10 12:17:44 +0000 differ
=== added file 'qml/Dash/graphics/suru_scope_portrait@27.jpg'
581Binary files qml/Dash/graphics/suru_scope_portrait@27.jpg 1970-01-01 00:00:00 +0000 and qml/Dash/graphics/suru_scope_portrait@27.jpg 2015-04-10 12:17:44 +0000 differ588Binary files qml/Dash/graphics/suru_scope_portrait@27.jpg 1970-01-01 00:00:00 +0000 and qml/Dash/graphics/suru_scope_portrait@27.jpg 2015-04-10 12:17:44 +0000 differ

Subscribers

People subscribed via source and target branches