1
=== modified file 'qml/Stages/Splash.qml'
2
--- qml/Stages/Splash.qml	2016-05-19 15:22:34 +0000
3
+++ qml/Stages/Splash.qml	2016-08-23 09:06:36 +0000
4
@@ -119,6 +119,7 @@
5
119
    }
119
    }
6
120
120
7
121
    Label {
121
    Label {
8
122
        id: titleLabel
9
122
        text: root.title
123
        text: root.title
10
123
        anchors.horizontalCenter: parent.horizontalCenter
124
        anchors.horizontalCenter: parent.horizontalCenter
11
124
        anchors.top: iconShape.bottom
125
        anchors.top: iconShape.bottom
12
@@ -137,12 +138,8 @@
13
137
138
14
138
    ActivityIndicator {
139
    ActivityIndicator {
15
139
        id: spinner
140
        id: spinner
22
140
        anchors.centerIn: header.visible ? parent : undefined
141
        anchors.centerIn: parent
23
141
        anchors.verticalCenterOffset: header.visible ? header.height / 2 : 0
142
        anchors.verticalCenterOffset: header.visible ? header.height / 2 : Math.max(titleLabel.y / 2, units.gu(8))
18
142
19
143
        anchors.horizontalCenter: header.visible ? undefined : parent.horizontalCenter
20
144
        anchors.bottom: header.visible ? undefined : parent.bottom
21
145
        anchors.bottomMargin: header.visible ? 0 : units.gu(12)
24
146
    }
143
    }
25
147
144
26
148
    MouseArea {
145
    MouseArea {
27
149
146
28
=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
29
--- tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-07-25 14:57:11 +0000
30
+++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-08-23 09:06:36 +0000
31
@@ -138,7 +138,7 @@
32
138
138
33
139
void ApplicationInfo::setIconId(const QString &iconId)
139
void ApplicationInfo::setIconId(const QString &iconId)
34
140
{
140
{
36
141
    setIcon(QString("../../tests/graphics/applicationIcons/%2@18.png")
141
    setIcon(QString("../../graphics/applicationIcons/%2@18.png")
37
142
            .arg(iconId));
142
            .arg(iconId));
38
143
}
143
}
39
144
144
40
145
145
41
=== modified file 'tests/qmltests/Stages/tst_Splash.qml'
42
--- tests/qmltests/Stages/tst_Splash.qml	2015-07-15 15:07:19 +0000
43
+++ tests/qmltests/Stages/tst_Splash.qml	2016-08-23 09:06:36 +0000
44
@@ -55,7 +55,7 @@
45
55
            bottom: parent.bottom
55
            bottom: parent.bottom
46
56
            left: parent.left
56
            left: parent.left
47
57
        }
57
        }
49
58
        width: units.gu(40)
58
        width: landscapeCheckbox.checked ? units.gu(70) : units.gu(40)
50
59
        sourceComponent: splashComponent
59
        sourceComponent: splashComponent
51
60
    }
60
    }
52
61
61
53
@@ -97,6 +97,20 @@
54
97
                CheckBox {id: footerColorCheckbox; checked: false; }
97
                CheckBox {id: footerColorCheckbox; checked: false; }
55
98
                Label { text: "custom footerColor"; anchors.verticalCenter: parent.verticalCenter }
98
                Label { text: "custom footerColor"; anchors.verticalCenter: parent.verticalCenter }
56
99
            }
99
            }
57
100
            Row {
58
101
                anchors { left: parent.left; right: parent.right }
59
102
                CheckBox {
60
103
                    id: landscapeCheckbox
61
104
                    checked: false
62
105
                    onCheckedChanged: {
63
106
                    if (checked) {
64
107
                        window.width = Math.max(window.width, units.gu(110));
65
108
                    }
66
109
                    window.height = checked ? units.gu(40) : units.gu(70);
67
110
                }
68
111
                }
69
112
                Label { text: "Landscape"; anchors.verticalCenter: parent.verticalCenter }
70
113
            }
71
100
        }
114
        }
72
101
    }
115
    }
73
102
116
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-08-23
Lukáš Tinkl (community)		2016-08-16	Approve on 2016-08-23
Review via email: mp+303021@code.launchpad.net