1
=== modified file 'modules/Ubuntu/Components/Header.qml'
2
--- modules/Ubuntu/Components/Header.qml	2013-03-27 11:11:43 +0000
3
+++ modules/Ubuntu/Components/Header.qml	2013-04-04 19:43:21 +0000
4
@@ -46,6 +46,8 @@
5
46
    }
46
    }
6
47
    height: Theming.ComponentUtils.delegateProperty(header, "height", units.gu(10))
47
    height: Theming.ComponentUtils.delegateProperty(header, "height", units.gu(10))
7
48
48
8
49
    visible: title || contents
9
50
10
49
    /*!
51
    /*!
11
50
      Show the header
52
      Show the header
12
51
     */
53
     */
13
@@ -63,16 +65,14 @@
14
63
    /*!
65
    /*!
15
64
      The text to display in the header
66
      The text to display in the header
16
65
     */
67
     */
22
66
    property string title
68
    property string title: ""
23
67
    onTitleChanged: {
69
    onTitleChanged: contentsChanged()
19
68
        if (title) header.show();
20
69
        else header.hide();
21
70
    }
24
71
70
25
72
    /*!
71
    /*!
26
73
      The contents of the header. If this is set, \l title will be ignored.
72
      The contents of the header. If this is set, \l title will be ignored.
27
74
     */
73
     */
28
75
    property Component contents: null
74
    property Component contents: null
29
75
    onContentsChanged: header.show()
30
76
76
31
77
    /*!
77
    /*!
32
78
      The flickable that controls the movement of the header.
78
      The flickable that controls the movement of the header.
33
79
79
34
=== modified file 'modules/Ubuntu/Components/Page.qml'
35
--- modules/Ubuntu/Components/Page.qml	2013-03-08 12:45:26 +0000
36
+++ modules/Ubuntu/Components/Page.qml	2013-04-04 19:43:21 +0000
37
@@ -116,7 +116,7 @@
38
116
        onHeaderHeightChanged: internal.updateFlickableMargins()
116
        onHeaderHeightChanged: internal.updateFlickableMargins()
39
117
        Component.onCompleted: internal.updateFlickableMargins()
117
        Component.onCompleted: internal.updateFlickableMargins()
40
118
118
42
119
        property real headerHeight: page.header ? page.header.height : 0
119
        property real headerHeight: page.header && page.header.visible ? page.header.height : 0
43
120
120
44
121
        function isFlickable(object) {
121
        function isFlickable(object) {
45
122
            return object && object.hasOwnProperty("flicking") && object.hasOwnProperty("flickableDirection");
122
            return object && object.hasOwnProperty("flicking") && object.hasOwnProperty("flickableDirection");
46
123
123
47
=== modified file 'tests/unit/tst_components/tst_page.qml'
48
--- tests/unit/tst_components/tst_page.qml	2013-03-12 18:48:37 +0000
49
+++ tests/unit/tst_components/tst_page.qml	2013-04-04 19:43:21 +0000
50
@@ -18,34 +18,63 @@
51
18
import QtTest 1.0
18
import QtTest 1.0
52
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 0.1
53
20
20
77
21
TestCase {
21
Item {
78
22
    name: "PageAPI"
22
    width: 200
79
23
23
    height: 200
57
24
    function test_title() {
58
25
        compare(page.title, "", "is not set by default")
59
26
        compare(mainView.header.title, "", "header title is not set by default")
60
27
        var newTitle = "Hello World!"
61
28
        page.title = newTitle
62
29
        compare(page.title, newTitle, "can set/get")
63
30
        compare(mainView.header.title, newTitle, "header title updated by changing page title")
64
31
    }
65
32
66
33
    function test_tools() {
67
34
        compare(mainView.toolbar.tools, page.tools, "Page updates toolbar tools");
68
35
    }
69
36
70
37
    function test_active() {
71
38
        compare(page.active, true, "Page is active by default");
72
39
    }
73
40
74
41
    function test_pageStack() {
75
42
        compare(page.pageStack, null, "is not set by default")
76
43
    }
80
44
24
81
45
    MainView {
25
    MainView {
82
26
        anchors.fill: parent
83
46
        id: mainView
27
        id: mainView
84
47
        Page {
28
        Page {
85
48
            id: page
29
            id: page
86
49
        }
30
        }
87
50
    }
31
    }
88
32
89
33
    TestCase {
90
34
        name: "PageAPI"
91
35
        when: windowShown
92
36
93
37
        function initTestCase() {
94
38
            compare(page.title, "", "is not set by default")
95
39
            compare(page.header, mainView.header, "page header equals mainView header")
96
40
            compare(page.header.title, page.title, "header title is same as page title")
97
41
            compare(page.header.visible, false, "header is not visible initially because there is no title")
98
42
        }
99
43
100
44
        function test_0_noHeader_bug1162028_bug1161910() {
101
45
            compare(mainView.header.title, "", "no header title by default")
102
46
            compare(mainView.header.visible, false, "header is hidden when title is not set")
103
47
            compare(page.height, mainView.height, "page uses full height when there is no header")
104
48
        }
105
49
106
50
        function test_title() {
107
51
            var newTitle = "Hello World!"
108
52
            page.title = newTitle
109
53
            compare(page.title, newTitle, "can set/get")
110
54
            page.title = ""
111
55
            compare(page.title, "", "can unset")
112
56
        }
113
57
114
58
        function test_header() {
115
59
            var newTitle = "Hello header!"
116
60
            page.title = newTitle
117
61
            compare(mainView.header.title, newTitle, "header title updated by changing page title")
118
62
            compare(mainView.header.visible, true, "header is visible when title is set")
119
63
            page.title = ""
120
64
            compare(mainView.header.title, "", "header title unset by unsetting page title")
121
65
            compare(mainView.header.visible, false, "header is hidden when title is unset")
122
66
        }
123
67
124
68
        function test_tools() {
125
69
            compare(mainView.toolbar.tools, page.tools, "Page updates toolbar tools");
126
70
        }
127
71
128
72
        function test_active() {
129
73
            compare(page.active, true, "Page is active by default");
130
74
        }
131
75
132
76
        function test_pageStack() {
133
77
            compare(page.pageStack, null, "is not set by default")
134
78
        }
135
79
    }
136
51
}
80
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-04-04
Zoltan Balogh		2013-04-04	Pending
Review via email: mp+157211@code.launchpad.net