Ubuntu UI Toolkit

Merge lp://staging/~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-shape-overlay into lp://staging/ubuntu-ui-toolkit/staging

ubuntu-ui-toolkit-shape-overlay
Merge into staging

Proposed by Loïc Molinari on 2015-03-04

Status:

Merged

Approved by:

Zsombor Egri on 2015-03-09

Approved revision:

1339

Merged at revision:

1439

Proposed branch:

lp://staging/~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-shape-overlay

Merge into:

lp://staging/ubuntu-ui-toolkit/staging

Diff against target:

1104 lines (+1015/-1)

9 files modified

components.api (+5/-0)
modules/Ubuntu/Components/plugin/plugin.cpp (+2/-0)
modules/Ubuntu/Components/plugin/plugin.pro (+5/-1)
modules/Ubuntu/Components/plugin/plugin.qrc (+2/-0)
modules/Ubuntu/Components/plugin/shaders/shapeoverlay.frag (+65/-0)
modules/Ubuntu/Components/plugin/shaders/shapeoverlay.vert (+49/-0)
modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp (+445/-0)
modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.h (+112/-0)
tests/resources/ubuntushape/UbuntuShapeOverlayTest.qml (+330/-0)

To merge this branch:

bzr merge lp://staging/~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-shape-overlay

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2015-03-04	Approve on 2015-03-09
Zsombor Egri		2015-03-04	Approve on 2015-03-09
Review via email: mp+251808@code.staging.launchpad.net

This proposal supersedes a proposal from 2014-12-01.

Commit message

Added a dedicated overlay shape.

Made use of the new UbuntuShape architecture to create an extended shape with efficient overlay rendering.

Description of the change

Added a dedicated overlay shape.

Made use of the new UbuntuShape architecture to create an extended shape with efficient overlay rendering.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-01: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1325
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1296/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/428/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/428/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1296/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-02: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1326
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1298/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/432/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/432/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1298/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Zsombor Egri (zsombi) wrote on 2015-01-14: Posted in a previous version of this proposal

Some preliminary comments inline.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-27: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1335
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1495/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1579/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/222/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/225/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/222/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1577/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1495/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-shape-overlay updated on 2015-03-04

1337. By Loïc Molinari on 2015-03-04: Merged main branch.
1338. By Loïc Molinari on 2015-03-04: Updated components.api.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-04:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1517/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-shape-overlay updated on 2015-03-05

1339. By Loïc Molinari on 2015-03-05: Made use of qBound() instead of qMin()/qMax().

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-06:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1522/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Zsombor Egri (zsombi) wrote on 2015-03-08:

Small cosmetic comments inline.

Let's discuss whether we create a new FFe then we can keep this in 1.2. If we do so, a small description in "What's new..." documentation section should be also added. Then we land it.

review: Needs Fixing

Revision history for this message

Zsombor Egri (zsombi) wrote on 2015-03-09:

Let's try to land this in 1.2 still!

review: Approve

Revision history for this message

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

review: Approve (continuous-integration)