1
=== modified file 'debian/control'
2
--- debian/control	2016-03-04 21:04:22 +0000
3
+++ debian/control	2016-03-04 21:04:22 +0000
4
@@ -55,7 +55,7 @@
5
55
               qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),
55
               qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),
6
56
               qtdeclarative5-ubuntu-content1,
56
               qtdeclarative5-ubuntu-content1,
7
57
               qtdeclarative5-ubuntu-settings-components (>= 0.7),
57
               qtdeclarative5-ubuntu-settings-components (>= 0.7),
9
58
               qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1676) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1676),
58
               qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
10
59
               qtdeclarative5-ubuntu-web-plugin,
59
               qtdeclarative5-ubuntu-web-plugin,
11
60
               ttf-ubuntu-font-family,
60
               ttf-ubuntu-font-family,
12
61
Standards-Version: 3.9.4
61
Standards-Version: 3.9.4
13
@@ -70,7 +70,7 @@
14
70
Package: indicators-client
70
Package: indicators-client
15
71
Architecture: amd64 armhf i386
71
Architecture: amd64 armhf i386
16
72
Depends: qmenumodel-qml (>= 0.2.9),
72
Depends: qmenumodel-qml (>= 0.2.9),
18
73
         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),
73
         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
19
74
         unity8 (= ${binary:Version}),
74
         unity8 (= ${binary:Version}),
20
75
         ${misc:Depends},
75
         ${misc:Depends},
21
76
         ${shlibs:Depends},
76
         ${shlibs:Depends},
22
@@ -128,7 +128,7 @@
23
128
Depends: qml-module-qtquick-layouts,
128
Depends: qml-module-qtquick-layouts,
24
129
         qtdeclarative5-ubuntu-settings-components (>= 0.7),
129
         qtdeclarative5-ubuntu-settings-components (>= 0.7),
25
130
         qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
130
         qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
27
131
         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),
131
         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
28
132
         qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
132
         qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
29
133
         ubuntu-thumbnailer-impl-0,
133
         ubuntu-thumbnailer-impl-0,
30
134
         unity-application-impl-13,
134
         unity-application-impl-13,
31
@@ -158,7 +158,7 @@
32
158
         python3-fixtures,
158
         python3-fixtures,
33
159
         python3-gi,
159
         python3-gi,
34
160
         qttestability-autopilot (>= 1.4),
160
         qttestability-autopilot (>= 1.4),
36
161
         ubuntu-ui-toolkit-autopilot (>= 1.2.1485+15.04.20150417.1-0ubuntu1),
161
         ubuntu-ui-toolkit-autopilot (>= 1.3.1796),
37
162
         unity-scope-click,
162
         unity-scope-click,
38
163
         unity8 (= ${source:Version}),
163
         unity8 (= ${source:Version}),
39
164
         unity8-fake-env (= ${source:Version}),
164
         unity8-fake-env (= ${source:Version}),
40
165
165
41
=== modified file 'qml/Components/Header.qml'
42
--- qml/Components/Header.qml	2015-07-10 07:47:35 +0000
43
+++ qml/Components/Header.qml	2016-03-04 21:04:22 +0000
44
@@ -18,6 +18,7 @@
45
18
import Ubuntu.Components.Themes.Ambiance 1.3
18
import Ubuntu.Components.Themes.Ambiance 1.3
46
19
19
47
20
PageHeadStyle {
20
PageHeadStyle {
48
21
    // FIXME: Don't use this but PageHeader from Ubuntu.Components 1.3.
49
21
    id: root
22
    id: root
50
22
23
51
23
    property var styledItem: root
24
    property var styledItem: root
52
24
25
53
=== modified file 'qml/Dash/DashPageHeader.qml'
54
--- qml/Dash/DashPageHeader.qml	2015-12-21 12:14:57 +0000
55
+++ qml/Dash/DashPageHeader.qml	2016-03-04 21:04:22 +0000
56
@@ -170,6 +170,7 @@
57
170
            anchors { left: parent.left; right: parent.right }
170
            anchors { left: parent.left; right: parent.right }
58
171
171
59
172
            PageHeadStyle {
172
            PageHeadStyle {
60
173
                // FIXME: Replace PageHeadStyle from the Ambiance theme by the new PageHeader from Ubuntu.Components 1.3.
61
173
                id: searchHeader
174
                id: searchHeader
62
174
                anchors { left: parent.left; right: parent.right }
175
                anchors { left: parent.left; right: parent.right }
63
175
                opacity: headerContainer.clip || headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
176
                opacity: headerContainer.clip || headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
64
@@ -179,6 +180,7 @@
65
179
                property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
180
                property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
66
180
                property color panelColor: background.topColor
181
                property color panelColor: background.topColor
67
181
                panelForegroundColor: config.foregroundColor
182
                panelForegroundColor: config.foregroundColor
68
183
                backgroundColor: "transparent"
69
182
                config: PageHeadConfiguration {
184
                config: PageHeadConfiguration {
70
183
                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
185
                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
71
184
                    backAction: Action {
186
                    backAction: Action {
72
@@ -241,6 +243,7 @@
73
241
            }
243
            }
74
242
244
75
243
            PageHeadStyle {
245
            PageHeadStyle {
76
246
                // FIXME: Replace PageHeadStyle from the Ambiance theme by the new PageHeader from Ubuntu.Components 1.3.
77
244
                id: header
247
                id: header
78
245
                objectName: "innerPageHeader"
248
                objectName: "innerPageHeader"
79
246
                anchors { left: parent.left; right: parent.right }
249
                anchors { left: parent.left; right: parent.right }
80
@@ -251,6 +254,7 @@
81
251
                property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
254
                property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
82
252
                property color panelColor: background.topColor
255
                property color panelColor: background.topColor
83
253
                panelForegroundColor: config.foregroundColor
256
                panelForegroundColor: config.foregroundColor
84
257
                backgroundColor: "transparent"
85
254
                config: PageHeadConfiguration {
258
                config: PageHeadConfiguration {
86
255
                    title: root.title
259
                    title: root.title
87
256
                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
260
                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
88
257
261
89
=== modified file 'qml/Stages/Splash.qml'
90
--- qml/Stages/Splash.qml	2016-01-20 08:51:48 +0000
91
+++ qml/Stages/Splash.qml	2016-03-04 21:04:22 +0000
92
@@ -76,6 +76,7 @@
93
76
    }
76
    }
94
77
77
95
78
    Ambiance.PageHeadStyle {
78
    Ambiance.PageHeadStyle {
96
79
        // FIXME: Replace PageHeadStyle by PageHeader from Ubuntu.Components 1.3.
97
79
        id: header
80
        id: header
98
80
        anchors {
81
        anchors {
99
81
            left: parent.left;
82
            left: parent.left;
100
@@ -86,6 +87,7 @@
101
86
        property color dividerColor: Qt.darker(styledItem.backgroundColor, 1.1)
87
        property color dividerColor: Qt.darker(styledItem.backgroundColor, 1.1)
102
87
        property color panelColor: Qt.lighter(styledItem.backgroundColor, 1.1)
88
        property color panelColor: Qt.lighter(styledItem.backgroundColor, 1.1)
103
88
        panelForegroundColor: config.foregroundColor
89
        panelForegroundColor: config.foregroundColor
104
90
        backgroundColor: "transparent"
105
89
        config: PageHeadConfiguration {
91
        config: PageHeadConfiguration {
106
90
            id: headerConfig
92
            id: headerConfig
107
91
            foregroundColor: styledItem.fakeTheme.palette.selected.backgroundText
93
            foregroundColor: styledItem.fakeTheme.palette.selected.backgroundText
Status:	Merged
Approved by:	Michał Sawicz on 2016-03-05
Approved revision:	2218
Merged at revision:	2221
Proposed branch:	lp:~unity-team/unity8/fixBlackHeader
Merge into:	lp:unity8
Prerequisite:	lp:~unity-team/unity8/indicator-color-fixes
Diff against target:	107 lines (+11/-4) 4 files modified debian/control (+4/-4) qml/Components/Header.qml (+1/-0) qml/Dash/DashPageHeader.qml (+4/-0) qml/Stages/Splash.qml (+2/-0)
To merge this branch:	bzr merge lp:~unity-team/unity8/fixBlackHeader
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2016-03-04	Needs Fixing on 2016-03-05
Michał Sawicz			Approve on 2016-03-05
Albert Astals Cid		2016-03-04	Pending
Zoltan Balogh		2016-03-04	Pending
PS Jenkins bot	continuous-integration	2016-03-04	Pending
Review via email: mp+288176@code.launchpad.net