Ubuntu UI Toolkit

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

page13
Merge into staging

Proposed by Tim Peeters on 2015-03-17

Status:	Merged
Approved by:	Zsombor Egri on 2015-04-02
Approved revision:	1471
Merged at revision:	1460
Proposed branch:	lp:~tpeeters/ubuntu-ui-toolkit/page13
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	410 lines (+276/-35) 9 files modified components.api (+5/-0) modules/Ubuntu/Components/AppHeader.qml (+1/-0) modules/Ubuntu/Components/MainView12.qml (+9/-4) modules/Ubuntu/Components/Page10.qml (+2/-30) modules/Ubuntu/Components/Page13.qml (+84/-0) modules/Ubuntu/Components/pageUtils.js (+47/-0) modules/Ubuntu/Components/qmldir (+3/-0) tests/unit_x11/tst_components/tst_page11.qml (+1/-1) tests/unit_x11/tst_components/tst_page13.qml (+124/-0)
To merge this branch:	bzr merge lp:~tpeeters/ubuntu-ui-toolkit/page13
Related bugs:	Link a bug report
Related blueprints:	Additional new header features (Undefined)

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-03-26
Zsombor Egri (community)		2015-03-17	Approve on 2015-03-18
Review via email: mp+253290@code.launchpad.net

Commit Message

Create Page 1.3.

Description of the Change

Create Page 1.3 which removes deprecated API. In following MRs, new features will be added to Page 1.3.

The properties "tools", "__customHeaderContents" and "actions" (hud) were removed from the API compared to Page 1.2.

lp:~tpeeters/ubuntu-ui-toolkit/page13 updated on 2015-03-17

1464. By Tim Peeters on 2015-03-17: update test names

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

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

review: Needs Fixing (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/page13 updated on 2015-03-18

1465. By Tim Peeters on 2015-03-18: kick jenkins
1466. By Tim Peeters on 2015-03-18: backwards compatibility

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

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

review: Needs Fixing (continuous-integration)

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

Typo. See inline comments.

review: Needs Fixing

Tim Peeters (tpeeters) wrote on 2015-03-18:

> This is getting too complex and slow... I think we must do
> something to ease version detection...
> QuickUtils.inherits(object, classname) perhaps would be faster...
> not sure... If not mistaken it also uses the file name not the
> type name from qmldir.

I agree, but for a separate MR?

> I start to hav the feeling we should have a Binding component
> which can do multiple property bindings of the same target...

You can propose an API and MR for that ;)

lp:~tpeeters/ubuntu-ui-toolkit/page13 updated on 2015-03-18

1467. By Tim Peeters on 2015-03-18: fix typo and copyright years

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

Ok, let's continue in a new MR.

review: Approve

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

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

review: Needs Fixing (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/page13 updated on 2015-03-23

1468. By Tim Peeters on 2015-03-23: merge staging

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

PASSED: Continuous integration, rev:1468
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1585/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1923
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/312
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/315
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/315/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/312
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1695
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1921
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1921/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19079

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

review: Approve (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/page13 updated on 2015-03-24

1469. By Tim Peeters on 2015-03-24: merge staging

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

PASSED: Continuous integration, rev:1469
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1595/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1946
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/322
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/325
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/325/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/322
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1715
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1944
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1944/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19102

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

review: Approve (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/page13 updated on 2015-03-26

1470. By Tim Peeters on 2015-03-26: merge staging

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

PASSED: Continuous integration, rev:1470
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1603/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1989
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/330
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/333
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/333/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/330
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1752
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1987
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1987/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19192

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

review: Approve (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/page13 updated on 2015-04-02

1471. By Tim Peeters on 2015-04-02: merge staging

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 'components.api'
 --- components.api	2015-03-10 13:58:52 +0000
 +++ components.api	2015-04-02 11:15:46 +0000
@@ -248,6 +248,11 @@
  Page 1.1
  Page10
      readonly property PageHeadConfiguration head
++Page 1.3
++PageTreeNode
++    property string title
++    property Flickable flickable
++    readonly property PageHeadConfiguration head
  PageHeadConfiguration 1.1
  Object
      property list<Action> actions
 === modified file 'modules/Ubuntu/Components/AppHeader.qml'
 --- modules/Ubuntu/Components/AppHeader.qml	2015-03-03 13:47:48 +0000
 +++ modules/Ubuntu/Components/AppHeader.qml	2015-04-02 11:15:46 +0000
@@ -89,6 +89,7 @@
      /*!
        The contents of the header. If this is set, \l title will be ignored.
++      DEPRECATED and replaced by Page.head.contents.
       */
      property Item contents: null
      onContentsChanged: {
 === modified file 'modules/Ubuntu/Components/MainView12.qml'
 --- modules/Ubuntu/Components/MainView12.qml	2015-03-03 12:53:42 +0000
 +++ modules/Ubuntu/Components/MainView12.qml	2015-04-02 11:15:46 +0000
@@ -80,7 +80,8 @@
              flickable: internal.activePage ? internal.activePage.flickable : null
              pageStack: internal.activePage ? internal.activePage.pageStack : null
--            contents: internal.activePage ?
++            contents: internal.activePage &&
++                      internal.activePage.hasOwnProperty("__customHeaderContents") ?
                            internal.activePage.__customHeaderContents : null
              PageHeadConfiguration {
@@ -127,11 +128,15 @@
          // Even when using MainView 1.1, we still support Page 1.0.
          // PageBase (=Page 1.0) is the superclass of Page 1.1.
--        property PageBase activePage: isPage(mainView.activeLeafNode) ? mainView.activeLeafNode : null
++        property Item activePage: isPage(mainView.activeLeafNode) ? mainView.activeLeafNode : null
          function isPage(item) {
--            return item && item.hasOwnProperty("__isPageTreeNode") && item.__isPageTreeNode &&
--                    item.hasOwnProperty("title") && item.hasOwnProperty("tools");
++            return item && item.hasOwnProperty("__isPageTreeNode") &&
++                    item.__isPageTreeNode &&
++                    item.hasOwnProperty("title") &&
++                    item.hasOwnProperty("flickable") &&
++                    item.hasOwnProperty("active") &&
++                    item.hasOwnProperty("pageStack")
+         }
+     }
 === modified file 'modules/Ubuntu/Components/Page10.qml'
 --- modules/Ubuntu/Components/Page10.qml	2015-03-03 13:47:48 +0000
 +++ modules/Ubuntu/Components/Page10.qml	2015-04-02 11:15:46 +0000
@@ -16,6 +16,7 @@
  import QtQuick 2.4
  import Ubuntu.Components 1.2 as Toolkit
++import "pageUtils.js" as Utils
  /*!
    \internal
@@ -53,7 +54,7 @@
       */
      property Item __customHeaderContents: null
--    property Flickable flickable: internal.getFlickableChild(page)
++    property Flickable flickable: Utils.getFlickableChild(page)
      /*! \internal */
      onActiveChanged: {
@@ -95,34 +96,5 @@
              when: internal.header && !internal.header.useDeprecatedToolbar &&
                    page.tools !== null
+         }
--
--        function isVerticalFlickable(object) {
--            if (object && object.hasOwnProperty("flickableDirection") && object.hasOwnProperty("contentHeight")) {
--                var direction = object.flickableDirection;
--                if ( ((direction === Flickable.AutoFlickDirection) && (object.contentHeight !== object.height) )
--                        || direction === Flickable.VerticalFlick
--                        || direction === Flickable.HorizontalAndVerticalFlick) {
--                    return true;
--                }
--            }
--            return false;
--        }
--
--        /*!
--          Return the first flickable child of this page.
--         */
--        function getFlickableChild(item) {
--            if (item && item.hasOwnProperty("children")) {
--                for (var i=0; i < item.children.length; i++) {
--                    var child = item.children[i];
--                    if (internal.isVerticalFlickable(child)) {
--                        if (child.anchors.top === page.top || child.anchors.fill === page) {
--                            return item.children[i];
--                        }
--                    }
--                }
--            }
--            return null;
--        }
+     }
+ }
 === added file 'modules/Ubuntu/Components/Page13.qml'
 --- modules/Ubuntu/Components/Page13.qml	1970-01-01 00:00:00 +0000
 +++ modules/Ubuntu/Components/Page13.qml	2015-04-02 11:15:46 +0000
@@ -0,0 +1,84 @@
++/*
++ * Copyright 2015 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import Ubuntu.Components 1.3 as Toolkit13
++import "pageUtils.js" as Utils
++
++/*!
++  \internal
++  Documentation is in Page.qdoc
++*/
++PageTreeNode {
++    id: page
++    anchors {
++        left: parent ? parent.left : undefined
++        bottom: parent ? parent.bottom : undefined
++    }
++    // Set width and height so that a parent Loader can be automatically resized
++    // to the size of the loaded Page.
++    width: parentNode ? parentNode.width - page.x : undefined
++    height: parentNode ? page.flickable ? parentNode.height : parentNode.height - internal.headerHeight : undefined
++
++    isLeaf: true
++    property string title: parentNode && parentNode.hasOwnProperty("title") ? parentNode.title : ""
++    property Flickable flickable: Utils.getFlickableChild(page)
++
++    /*!
++      \qmlproperty PageHeadConfiguration head
++     */
++    readonly property alias head: headerConfig
++    Toolkit13.PageHeadConfiguration {
++        id: headerConfig
++    }
++
++    Object {
++        id: internal
++
++        property AppHeader header: page.__propagated && page.__propagated.header ? page.__propagated.header : null
++        // Used to position the Page when there is no flickable.
++        // When there is a flickable, the header will automatically position it.
++        property real headerHeight: internal.header && internal.header.visible ? internal.header.height : 0
++
++        // Note: The bindings below need to check whether headerConfig.contents
++        // is valid in the "value", even when that is required in the Binding's "when"
++        // property, to avoid TypeErrors while/after a page becomes (in)active.
++        //
++        // Note 2: contents.parent binding is made by PageHeadStyle.
++        property bool hasParent: headerConfig.contents &&
++                                 headerConfig.contents.parent
++
++        Binding {
++            target: headerConfig.contents
++            property: "visible"
++            value: page.active
++            when: headerConfig.contents
++        }
++        Binding {
++            target: headerConfig.contents
++            property: "anchors.verticalCenter"
++            value: internal.hasParent ? headerConfig.contents.parent.verticalCenter :
++                                        undefined
++            when: headerConfig.contents
++        }
++        Binding {
++            target: headerConfig.contents
++            property: "anchors.left"
++            value: internal.hasParent ? headerConfig.contents.parent.left : undefined
++            when: headerConfig.contents
++        }
++    }
++}
 === added file 'modules/Ubuntu/Components/pageUtils.js'
 --- modules/Ubuntu/Components/pageUtils.js	1970-01-01 00:00:00 +0000
 +++ modules/Ubuntu/Components/pageUtils.js	2015-04-02 11:15:46 +0000
@@ -0,0 +1,47 @@
++/*
++ * Copyright 2015 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++/*!
++  Return true if the object is a Flickable that can be flicked in vertical direction.
++ */
++function isVerticalFlickable(object) {
++    if (object && object.hasOwnProperty("flickableDirection") && object.hasOwnProperty("contentHeight")) {
++        var direction = object.flickableDirection;
++        if ( ((direction === Flickable.AutoFlickDirection) && (object.contentHeight !== object.height) )
++                || direction === Flickable.VerticalFlick
++                || direction === Flickable.HorizontalAndVerticalFlick) {
++            return true;
++        }
++    }
++    return false;
++}
++
++/*!
++  Return the first child of the item that is flickable in the vertical direction.
++ */
++function getFlickableChild(item) {
++    if (item && item.hasOwnProperty("children")) {
++        for (var i=0; i < item.children.length; i++) {
++            var child = item.children[i];
++            if (isVerticalFlickable(child)) {
++                if (child.anchors.top === page.top || child.anchors.fill === page) {
++                    return item.children[i];
++                }
++            }
++        }
++    }
++    return null;
++}
 === modified file 'modules/Ubuntu/Components/qmldir'
 --- modules/Ubuntu/Components/qmldir	2015-03-02 13:39:03 +0000
 +++ modules/Ubuntu/Components/qmldir	2015-04-02 11:15:46 +0000
@@ -111,3 +111,6 @@
  #version 1.2
  MainView 1.2 MainView12.qml
  Captions 1.2 Captions.qml
++
++#version 1.3
++Page 1.3 Page13.qml
 === renamed file 'tests/unit_x11/tst_components/tst_page.qml' => 'tests/unit_x11/tst_components/tst_page11.qml'
 --- tests/unit_x11/tst_components/tst_page.qml	2015-03-03 13:20:06 +0000
 +++ tests/unit_x11/tst_components/tst_page11.qml	2015-04-02 11:15:46 +0000
@@ -54,7 +54,7 @@
+     }
      TestCase {
--        name: "PageAPI"
++        name: "Page11API"
          when: windowShown
          function initTestCase() {
 === added file 'tests/unit_x11/tst_components/tst_page13.qml'
 --- tests/unit_x11/tst_components/tst_page13.qml	1970-01-01 00:00:00 +0000
 +++ tests/unit_x11/tst_components/tst_page13.qml	2015-04-02 11:15:46 +0000
@@ -0,0 +1,124 @@
++/*
++ * Copyright 2012-2015 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import QtTest 1.0
++import Ubuntu.Components 1.3
++
++Item {
++    width: 400
++    height: 600
++
++    Flickable {
++        id: testFlickable
++    }
++
++    MainView {
++        anchors.fill: parent
++        id: mainView
++        Page {
++            id: page
++            Flickable {
++                id: pageFlickable
++                anchors.fill: parent
++                contentHeight: column.height
++
++                Column {
++                    id: column
++                    Repeater {
++                        model: 100
++                        Label {
++                            text: "line "+index
++                        }
++                    }
++                }
++            }
++        }
++    }
++
++    TestCase {
++        name: "Page13API"
++        when: windowShown
++
++        function initTestCase() {
++            compare(page.title, "", "Page title is set by default.");
++            compare(page.active, true, "Page is inactive by default.");
++            compare(page.pageStack, null, "Page has a PageStack by default.");
++        }
++
++        function test_title() {
++            var newTitle = "Hello World!";
++            page.title = newTitle;
++            compare(page.title, newTitle, "Could not set page title.");
++            page.title = "";
++            compare(page.title, "", "Could not unset page title.");
++        }
++
++        function test_header_title() {
++            var newTitle = "Hello header!";
++            page.title = newTitle;
++            var header = mainView.__propagated.header;
++            compare(header.title, newTitle, "Header title does not match active page title.");
++            page.title = "";
++        }
++
++        function test_flickable_bug1200642_bug1192591() {
++            var header = page.__propagated.header;
++            compare(page.flickable, pageFlickable,
++                    "Flickable is not correctly detected.");
++            compare(header.flickable, pageFlickable,
++                    "Header flickable is not correctly set.");
++
++            page.flickable = testFlickable;
++            compare(page.flickable, testFlickable, "Flickable could not be set.");
++            compare(header.flickable, testFlickable,
++                    "Header flickable was not update correctly.");
++
++            page.flickable = null;
++            compare(page.flickable, null, "Flickable cannot be unset.");
++            compare(header.flickable, null,
++                    "Header flickable was not correctly unset.");
++        }
++
++        function test_flickableY_bug1201452() {
++            var pageTitle = "Hello bug!";
++            page.title = pageTitle;
++            var header = page.__propagated.header;
++
++            var headerHeight = header.height
++            var flickableY = 150;
++            page.flickable.contentY = flickableY;
++            compare(page.flickable.contentY, flickableY,
++                    "Flickable.contentY could not be set.");
++            compare(page.flickable.topMargin, headerHeight,
++                    "topMargin of the flickable does not equal header height.");
++            page.title = "";
++
++            // FIXME: Update the checks below when new API is added
++            //  for showing and hiding the header.
++            compare(header.visible, false, "Header is not hidden when title is unset.");
++            compare(page.flickable.topMargin, 0,
++                    "topMargin is not 0 when header is hidden.");
++            compare(page.flickable.contentY, flickableY + headerHeight,
++                    "contentY was not updated properly when header was hidden.");
++            page.title = pageTitle;
++            compare(page.flickable.contentY, flickableY,
++                    "Making header visible changes flickable.contentY");
++            compare(page.flickable.topMargin, headerHeight,
++                    "topMargin was not updated when header became visible.");
++        }
++    }
++}