Ubuntu UI Toolkit

Merge lp://staging/~tpeeters/ubuntu-ui-toolkit/tab-page-loader into lp://staging/ubuntu-ui-toolkit/staging

tab-page-loader
Merge into staging

Proposed by Tim Peeters on 2015-02-25

Status:

Merged

Approved by:

Cris Dywan on 2015-02-26

Approved revision:

1433

Merged at revision:

1419

Proposed branch:

lp://staging/~tpeeters/ubuntu-ui-toolkit/tab-page-loader

Merge into:

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

Diff against target:

143 lines (+116/-1)

3 files modified

modules/Ubuntu/Components/Page.qdoc (+6/-0)
modules/Ubuntu/Components/Page10.qml (+1/-1)
tests/unit_x11/tst_components/tst_page_size.qml (+109/-0)

To merge this branch:

bzr merge lp://staging/~tpeeters/ubuntu-ui-toolkit/tab-page-loader

Related bugs:

Bug #1424635: Locked header does not work with conditional loading components	High	Fix Released
Bug #1425470: Latest staging breaks page width in gallery	Critical	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-02-26
Cris Dywan		2015-02-25	Approve on 2015-02-26
Review via email: mp+250905@code.staging.launchpad.net

Commit message

Fix UITK gallery content page width.

Revision history for this message

Tim Peeters (tpeeters) wrote on 2015-02-25:

this could be fixed in 2 ways:

anchors.right: parent.right

or:

width: gallery.width - mainPage.width

lp://staging/~tpeeters/ubuntu-ui-toolkit/tab-page-loader updated on 2015-02-25

1426. By Tim Peeters on 2015-02-25: fix for phone layout as well

Revision history for this message

Tim Peeters (tpeeters) wrote on 2015-02-25:

The above solution setting the width does not work in phone layout and would require some additional code to make it work. So setting the anchor is better.

Revision history for this message

Cris Dywan (kalikiana) wrote on 2015-02-25:

After some discussion I'm convinced what the uitk gallery is doing is indeed bad abuse of API. But please provide a test case for the correct behavior of a Loader with no size set.

review: Needs Fixing

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

lp://staging/~tpeeters/ubuntu-ui-toolkit/tab-page-loader updated on 2015-02-25

1427. By Tim Peeters on 2015-02-25: document Page width/height/anchors
1428. By Tim Peeters on 2015-02-25: update Page docs
1429. By Tim Peeters on 2015-02-25: remove deprecated test
1430. By Tim Peeters on 2015-02-25: working on the test
1431. By Tim Peeters on 2015-02-25: don't break our gallery
1432. By Tim Peeters on 2015-02-25: update docs
1433. By Tim Peeters on 2015-02-25: update test

Revision history for this message

Tim Peeters (tpeeters) wrote on 2015-02-25:

I agree what the gallery is doing is not very clean.

However, with this update:
25 - width: parentNode ? parentNode.width : undefined
26 + width: parentNode ? parentNode.width - page.x : undefined
I no longer need to update the gallery.

Also, a unit test and documentation in Page.qdoc were added.

Revision history for this message

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