Ubuntu UI Toolkit

Merge lp:~tpeeters/ubuntu-ui-toolkit/topMargin-bug1572525 into lp:ubuntu-ui-toolkit/staging

topMargin-bug1572525
Merge into staging

Proposed by Tim Peeters on 2016-04-20

Status:

Merged

Approved by:

Zsombor Egri on 2016-04-20

Approved revision:

1948

Merged at revision:

1946

Proposed branch:

lp:~tpeeters/ubuntu-ui-toolkit/topMargin-bug1572525

Merge into:

lp:ubuntu-ui-toolkit/staging

Diff against target:

28 lines (+6/-6)

1 file modified

src/Ubuntu/Components/plugin/ucheader.cpp (+6/-6)

To merge this branch:

bzr merge lp:~tpeeters/ubuntu-ui-toolkit/topMargin-bug1572525

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-04-20
Zsombor Egri		2016-04-20	Approve on 2016-04-20
Review via email: mp+292386@code.launchpad.net

Commit message

Update Header.flickable docs.

Revision history for this message

Andrea Bernabei (faenil) wrote on 2016-04-20:

"...and does not reflect the header height."

that is a bit unclear to me...what do you mean? Maybe we can it out? or does it actually add information? The topMargin wasn't reflecting the header height anyway (in the most generic case)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-20:

PASSED: Continuous integration, rev:1946
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/466/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2751/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/466/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-20:

PASSED: Continuous integration, rev:1946
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/492/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2752/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/492/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-20:

PASSED: Continuous integration, rev:1946
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/711/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2753/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/711/rebuild

review: Approve (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/topMargin-bug1572525 updated on 2016-04-20

1947. By Tim Peeters on 2016-04-20: clarify docs

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-20:

PASSED: Continuous integration, rev:1946
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/678/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2754/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/678/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-20:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/309/rebuild

review: Approve (continuous-integration)

Revision history for this message

Zsombor Egri (zsombi) wrote on 2016-04-20:

See inline.

lp:~tpeeters/ubuntu-ui-toolkit/topMargin-bug1572525 updated on 2016-04-20

1948. By Tim Peeters on 2016-04-20: revert --> restore

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-20:

PASSED: Continuous integration, rev:1947
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/493/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2756/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/493/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-20:

PASSED: Continuous integration, rev:1947
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/467/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2757/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/467/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-20:

PASSED: Continuous integration, rev:1947
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/712/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2758/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/712/rebuild

review: Approve (continuous-integration)

Revision history for this message

Zsombor Egri (zsombi) wrote on 2016-04-20:

Hopefully this will be clear enough...

review: Approve

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-20:

PASSED: Continuous integration, rev:1947
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/679/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2759/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/679/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-20:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/310/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-20:

PASSED: Continuous integration, rev:1948
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/468/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2761/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/468/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-20:

PASSED: Continuous integration, rev:1948
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/494/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2762/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/494/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-20:

PASSED: Continuous integration, rev:1948
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/713/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2763/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/713/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-20:

PASSED: Continuous integration, rev:1948
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/680/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2764/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/680/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Dan Chapman 

Tim Peeters

Tom Mirmar

Ubuntu SDK team

 === modified file 'src/Ubuntu/Components/plugin/ucheader.cpp'
 --- src/Ubuntu/Components/plugin/ucheader.cpp	2016-04-11 16:40:01 +0000
 +++ src/Ubuntu/Components/plugin/ucheader.cpp	2016-04-20 15:26:38 +0000
@@ -165,11 +165,11 @@
   *  }
   * \endqml
+  *
-- * The topMargin of the flickable will automatically be updated to always match
-- * the height of the header. When changing the flickable, the topMargin of the previous
-- * flickable is set to 0. When the header is invisible because its visible property is
-- * false, or the header has no parent, the flickable topMargin does not reflect the
-- * header height.
++ * The topMargin of the flickable will automatically be updated by adding the height
++ * of the header to the current topMargin. When changing the flickable, the topMargin
++ * of the previous flickable is restored by subtracting the header height from it.
++ * Making the header invisible has the same effect on the topMargin as unsetting
++ * the flickable.
+  *
   * It is permitted to use a ListView as the value of flickable, but this works
   * well only if the ListView.header property is not set. Alternatively,
@@ -203,7 +203,7 @@
          m_previous_header_height = 0;
          delta -= m_flickable->topMargin() + m_flickable->contentY();
--        // revert the flickable content Y.
++        // restore the flickable content Y.
          m_flickable->setContentY(m_flickable->contentY() + delta);
+     }

Ubuntu UI Toolkit

Merge lp:~tpeeters/ubuntu-ui-toolkit/topMargin-bug1572525 into lp:ubuntu-ui-toolkit/staging

Commit message

Description of the change

Preview Diff

Subscribers