Merge lp:~unity-team/unity8/fix-1239317 into lp:unity8

Proposed by Andrea Cimitan
Status: Merged
Approved by: Gerry Boland
Approved revision: 483
Merged at revision: 496
Proposed branch: lp:~unity-team/unity8/fix-1239317
Merge into: lp:unity8
Diff against target: 11 lines (+1/-0)
1 file modified
Components/UbuntuShapeForItem.qml (+1/-0)
To merge this branch: bzr merge lp:~unity-team/unity8/fix-1239317
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Gerry Boland (community) Approve
Review via email: mp+193242@code.launchpad.net

Commit message

Place ShaderEffectSource of UbuntuShapeForItem under the Shape Item

Description of the change

ShaderEffectSource has to be rendered on screen in order to be used by the shader (Shape from Ubuntu.Components uses it), thus it cannot be with width or height of 0 pixels, neither it can use visible: false.
Simplest solution is putting it underneath the Shape item, so it cannot be seen because it'll be under that Item.

To post a comment you must log in.
lp:~unity-team/unity8/fix-1239317 updated
483. By Andrea Cimitan

Added comment

Revision history for this message
Gerry Boland (gerboland) wrote :

Will have to do. When we drop SurfaceFlinger support, the ApplicationImage component will be replaced with an image provider, and thus this UbuntuShapeForItem can go away.

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

FAILED: Continuous integration, rev:482
http://jenkins.qa.ubuntu.com/job/unity8-ci/1528/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/203
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/197/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/52/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/52
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/190
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/203
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/203/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/197
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/197/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2818/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2869/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/677
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/675

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1528/rebuild

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 'Components/UbuntuShapeForItem.qml'
2--- Components/UbuntuShapeForItem.qml 2013-06-28 17:44:36 +0000
3+++ Components/UbuntuShapeForItem.qml 2013-10-30 14:12:02 +0000
4@@ -31,6 +31,7 @@
5
6 ShaderEffectSource {
7 id: source
8+ anchors.centerIn: parent // Placed under shape, so it's hidden
9 width: 1
10 height: 1
11 hideSource: true

Subscribers

People subscribed via source and target branches