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

[Andrea Cimitan]

 * 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.

[PS Jenkins bot (ps-jenkins)]

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)

[PS Jenkins bot (ps-jenkins)]

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)

[Andrea Cimitan (cimi)]

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

[Gerry Boland (gerboland)]

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

[Ying-Chun Liu (paulliu)]

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

[Albert Astals Cid (aacid)]

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

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

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]

1440. By Andrea Cimitan on 2015-04-10

Removed colorBackground id

1441. By Andrea Cimitan on 2015-04-10

Show paper bg when colorBg is default or transparent

1442. By Andrea Cimitan on 2015-04-10

Added scaled versions

1443. By Andrea Cimitan on 2015-04-10

File renames

[PS Jenkins bot (ps-jenkins)]

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)

[PS Jenkins bot (ps-jenkins)]

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)

[Albert Astals Cid (aacid)]

Tags have been fixed

review: Abstain

[Andrea Cimitan (cimi)]

Design just told me they change plans and background is fixed

review: Disapprove

Unmerged revisions

1443. By Andrea Cimitan on 2015-04-10

File renames

1442. By Andrea Cimitan on 2015-04-10

Added scaled versions

1441. By Andrea Cimitan on 2015-04-10

Show paper bg when colorBg is default or transparent

1440. By Andrea Cimitan on 2015-04-10

Removed colorBackground id

1439. By Andrea Cimitan on 2015-04-10

Deleted old assets

1438. By Andrea Cimitan on 2015-04-10

Merged trunk, minor changes

1437. By Ying-Chun Liu on 2015-02-17

Remove old DashBackground.

1436. By Ying-Chun Liu on 2015-02-13

Add suru background

1435. By Ying-Chun Liu on 2015-02-13

Merge trunk

1434. By Ying-Chun Liu on 2014-11-27

merge trunk

=== 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 @@
         }
     }
 
-    DashBackground {
-        anchors.fill: scopeItem
-        visible: scopeItem.visible
-    }
-
     GenericScopeView {
         id: scopeItem
         objectName: "dashTempScopeItem"

=== 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 @@
 import QtQuick 2.0
 
 Image {
-    source: anchors.fill.width > anchors.fill.height ? "graphics/paper_landscape.png" : "graphics/paper_portrait.png"
-    fillMode: Image.PreserveAspectCrop
+    source: anchors.fill.width > anchors.fill.height ? "graphics/suru_scope_landscape.jpg" : "graphics/suru_scope_portrait.jpg"
+    fillMode: Image.TileVertically
     horizontalAlignment: Image.AlignRight
     verticalAlignment: Image.AlignTop
+    sourceSize.width: anchors.fill.width
+    sourceSize.height: 0
 }

=== 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 @@
 
         anchors.fill: parent
 
-        DashBackground {
-            anchors.fill: parent
-        }
-
         ListView {
             id: dashContentList
             objectName: "dashContentList"

=== 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 @@
     }
 
     Rectangle {
+        id: colorBackground
         anchors.fill: parent
         color: scopeView.scopeStyle ? scopeView.scopeStyle.background : "transparent"
         visible: color != "transparent"
@@ -567,6 +568,12 @@
             }
         }
 
+        DashBackground {
+            anchors.fill: parent
+            visible: !colorBackground.visible || colorBackground.color == "#f5f5f5"
+            z: -1
+        }
+
         sectionProperty: "name"
         sectionDelegate: ListItems.Header {
             objectName: "dashSectionHeader" + (delegate ? delegate.category : "")

=== removed file 'qml/Dash/graphics/[e-mail]'
Binary files qml/Dash/graphics/[e-mail]	2014-01-31 18:46:50 +0000 and qml/Dash/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'qml/Dash/graphics/[e-mail]'
Binary files qml/Dash/graphics/[e-mail]	2014-01-31 18:46:50 +0000 and qml/Dash/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== added file 'qml/Dash/graphics/[e-mail]'
Binary files qml/Dash/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and qml/Dash/graphics/[e-mail]	2015-04-10 12:17:44 +0000 differ
=== added file 'qml/Dash/graphics/[e-mail]'
Binary files qml/Dash/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and qml/Dash/graphics/[e-mail]	2015-04-10 12:17:44 +0000 differ
=== added file 'qml/Dash/graphics/[e-mail]'
Binary files qml/Dash/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and qml/Dash/graphics/[e-mail]	2015-04-10 12:17:44 +0000 differ
=== added file 'qml/Dash/graphics/[e-mail]'
Binary files qml/Dash/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and qml/Dash/graphics/[e-mail]	2015-04-10 12:17:44 +0000 differ
=== added file 'qml/Dash/graphics/[e-mail]'
Binary files qml/Dash/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and qml/Dash/graphics/[e-mail]	2015-04-10 12:17:44 +0000 differ
=== added file 'qml/Dash/graphics/[e-mail]'
Binary files qml/Dash/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and qml/Dash/graphics/[e-mail]	2015-04-10 12:17:44 +0000 differ