Ubuntu UI Toolkit

 === modified file 'modules/Ubuntu/Components/Page.qml'
 --- modules/Ubuntu/Components/Page.qml	2014-01-09 12:00:26 +0000
 +++ modules/Ubuntu/Components/Page.qml	2014-01-13 14:54:15 +0000
@@ -72,7 +72,8 @@
          right: parent ? parent.right : undefined
          bottom: parent ? parent.bottom : undefined
+     }
--    height: parent ? page.flickable ? parent.height : parent.height - internal.headerHeight : undefined
++    // avoid using parent.height because parent may be a Loader which does not have its height set.
++    height: parentNode ? page.flickable ? parentNode.height : parentNode.height - internal.headerHeight : undefined
      /*!
        The title of the page. Will be shown in the header of the \l MainView.
 === modified file 'modules/Ubuntu/Components/Tabs.qml'
 --- modules/Ubuntu/Components/Tabs.qml	2013-12-02 18:57:32 +0000
 +++ modules/Ubuntu/Components/Tabs.qml	2014-01-13 14:54:15 +0000
@@ -63,7 +63,11 @@
                      title: i18n.tr("External")
                      page: Loader {
                          parent: externalTab
--                        anchors.fill: parent
++                        anchors {
++                            left: parent.left
++                            right: parent.right
++                            bottom: parent.bottom
++                        }
                          source: (tabs.selectedTab === externalTab) ? Qt.resolvedUrl("MyCustomPage.qml") : ""
+                     }
+                 }
@@ -86,6 +90,8 @@
      \endqml
      As the example above shows, an external \l Page inside a \l Tab can be loaded using a Loader.
++    Note that setting the top anchor or the height of the Loader would override the \l Page height.
++    We avoid this because the \l Page automatically adapts its height to accommodate for the header.
      It is possible to use a Repeater to generate tabs, but when doing so, ensure that the Repeater
      is declared inside the Tabs at the end, because otherwise the shuffling of
 === modified file 'tests/unit_x11/tst_components/tst_tabs.qml'
 --- tests/unit_x11/tst_components/tst_tabs.qml	2013-12-10 14:25:43 +0000
 +++ tests/unit_x11/tst_components/tst_tabs.qml	2014-01-13 14:54:15 +0000
@@ -86,6 +86,20 @@
                      sourceComponent: tabs.selectedTabIndex != 5 ? null : pageComponent
+                 }
+             }
++            Tab {
++                id: tabNoFlickLoader
++                title: "loadNoFlick"
++                page: Loader {
++                    id: loaderNoFlick
++                    anchors {
++                        left: parent.left
++                        right: parent.right
++                        bottom: parent.bottom
++                    }
++                    // height compes from the loaded Page
++                    sourceComponent: tabs.selectedTabIndex === 6 ? pageComponentNoFlick : null
++                }
++            }
+         }
          Component {
              id: pageComponent
@@ -99,6 +113,12 @@
+                 }
+             }
+         }
++        Component {
++            id: pageComponentNoFlick
++            Page {
++                title: "Loaded page without flickable"
++            }
++        }
+     }
      ListModel {
@@ -364,6 +384,14 @@
              tabs.selectedTabIndex = 0;
+         }
++        function test_pageHeightLoaderNoFlick_bug1259917() {
++            tabs.selectedTabIndex = 6;
++            compare(tabs.selectedTab, tabNoFlickLoader, "Tab 6 was selected.");
++            compare(mainView.__propagated.header.flickable, null, "Loaded page without flickable.");
++            compare(loaderNoFlick.item.height, mainView.height - mainView.__propagated.header.height,
++                    "Correct height for loaded Page without flickable.");
++        }
++
          function test_index() {
              compare(tab1.index, 0, "tab1 is at 0");
              compare(tab2.index, 1, "tab2 is at 1");
@@ -371,6 +399,7 @@
              compare(tabFlick1.index, 3, "tabFlick1 is at 3");
              compare(tabFlick2.index, 4, "tabFlick2 is at 4");
              compare(tabFlickLoader.index, 5, "tabFlickLoader is at 5");
++            compare(tabNoFlickLoader.index, 6, "tabNoFlickLoader is at 6");
+         }
          function test_deactivateByTimeout() {

Ubuntu UI Toolkit

Merge lp:~tpeeters/ubuntu-ui-toolkit/pageHeight into lp:ubuntu-ui-toolkit

Commit message

Description of the change

Preview Diff

Subscribers