1
=== modified file 'qml/Dash/Previews/PreviewHeader.qml'
2
--- qml/Dash/Previews/PreviewHeader.qml	2014-05-02 15:48:08 +0000
3
+++ qml/Dash/Previews/PreviewHeader.qml	2014-05-19 08:14:19 +0000
4
@@ -56,6 +56,9 @@
5
56
56
6
57
            Loader {
57
            Loader {
7
58
                id: mascotShapeLoader
58
                id: mascotShapeLoader
8
59
                objectName: "mascotShapeLoader"
9
60
                active: headerRoot.mascot != ""
10
61
                visible: active
11
59
62
12
60
                anchors.verticalCenter: parent.verticalCenter
63
                anchors.verticalCenter: parent.verticalCenter
13
61
                // TODO karni: Icon aspect-ratio is 8:7.5. Revisit these values to avoid fraction of pixels.
64
                // TODO karni: Icon aspect-ratio is 8:7.5. Revisit these values to avoid fraction of pixels.
14
62
65
15
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewHeader.qml'
16
--- tests/qmltests/Dash/Previews/tst_PreviewHeader.qml	2014-05-02 15:48:08 +0000
17
+++ tests/qmltests/Dash/Previews/tst_PreviewHeader.qml	2014-05-19 08:14:19 +0000
18
@@ -53,12 +53,12 @@
19
53
        name: "PreviewHeaderTest"
53
        name: "PreviewHeaderTest"
20
54
        when: windowShown
54
        when: windowShown
21
55
55
23
56
        property Item mascot: findChild(previewHeader, "mascotShape")
56
        property Item mascotShapeLoader: findChild(previewHeader, "mascotShapeLoader")
24
57
        property Item outerRow: findChild(previewHeader, "outerRow")
57
        property Item outerRow: findChild(previewHeader, "outerRow")
25
58
        property Item column: findChild(previewHeader, "column")
58
        property Item column: findChild(previewHeader, "column")
26
59
59
27
60
        function initTestCase() {
60
        function initTestCase() {
29
61
            verify(typeof testCase.mascot === "object", "Couldn't find mascot object.");
61
            verify(typeof testCase.mascotShapeLoader === "object", "Couldn't find mascot loader object.");
30
62
            verify(typeof testCase.outerRow === "object", "Couldn't find outerRow object.");
62
            verify(typeof testCase.outerRow === "object", "Couldn't find outerRow object.");
31
63
            verify(typeof testCase.column === "object", "Couldn't find column object.");
63
            verify(typeof testCase.column === "object", "Couldn't find column object.");
32
64
64
33
@@ -70,9 +70,9 @@
34
70
70
35
71
        function test_mascot_data() {
71
        function test_mascot_data() {
36
72
            return [
72
            return [
40
73
                        { tag: "Empty", source: "", visible: false },
73
                        { tag: "Empty", source: "", loaderVisible: false, visible: false },
41
74
                        { tag: "Invalid", source: "bad_path", visible: false },
74
                        { tag: "Invalid", source: "bad_path", loaderVisible: true, visible: false },
42
75
                        { tag: "Valid", source: "../graphics/play_button.png", visible: true },
75
                        { tag: "Valid", source: "../graphics/play_button.png", loaderVisible: true, visible: true },
43
76
            ]
76
            ]
44
77
        }
77
        }
45
78
78
46
@@ -80,12 +80,17 @@
47
80
            headerjson.mascot = data.source;
80
            headerjson.mascot = data.source;
48
81
            previewHeader.widgetData = headerjson;
81
            previewHeader.widgetData = headerjson;
49
82
82
51
83
            tryCompare(testCase.mascot, "visible", data.visible);
83
            tryCompare(testCase.mascotShapeLoader, "visible", data.loaderVisible);
52
84
            if (data.loaderVisible) {
53
85
                tryCompareFunction(function() { return findChild(previewHeader, "mascotShape") != null }, true);
54
86
                var mascot = findChild(previewHeader, "mascotShape")
55
87
                tryCompare(mascot, "visible", data.visible);
56
88
            }
57
84
        }
89
        }
58
85
90
59
86
        function test_dimensions_data() {
91
        function test_dimensions_data() {
60
87
            return [
92
            return [
62
88
                { tag: "Column width with mascot", object: column, width: previewHeader.width - mascot.width - outerRow.margins * 3, mascot: "artwork/avatar.png" },
93
                { tag: "Column width with mascot", object: column, width: previewHeader.width - mascotShapeLoader.width - outerRow.margins * 3, mascot: "artwork/avatar.png" },
63
89
                { tag: "Header height", object: previewHeader, height: function() { return outerRow.height + outerRow.margins * 2 } },
94
                { tag: "Header height", object: previewHeader, height: function() { return outerRow.height + outerRow.margins * 2 } },
64
90
            ]
95
            ]
65
91
        }
96
        }
Reviewer	Review Type	Date Requested	Status
Andrea Cimitan (community)			Approve on 2014-05-21
PS Jenkins bot (community)	continuous-integration		Approve on 2014-05-19
Michal Hruby (community)		2014-05-14	Approve on 2014-05-14
Review via email: mp+219502@code.launchpad.net