git.iko.soy/unity8
on xenial help sign in
Update headers for Dash and Splash to work properly with the new UI toolkit release.

Approved by: Michał Sawicz

commit2db15d1271750579e349de9f70be8fac18abb02f authorMichał Sawicz <michal.sawicz@canonical.com> dateTue 8 Mar 2016, 20:59 (11 years ago) parente22fb85d593478
4 files changed+11−4
compare with xenial
unifiedsplit
debian/control+4−4 qml/Components/Header.qml+1 qml/Dash/DashPageHeader.qml+4 qml/Stages/Splash.qml+2
debian/control+4−4
@@ -55,7 +55,7 @@ Build-Depends: cmake,
5555 qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),
5656 qtdeclarative5-ubuntu-content1,
5757 qtdeclarative5-ubuntu-settings-components (>= 0.7),
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),
5959 qtdeclarative5-ubuntu-web-plugin,
6060 ttf-ubuntu-font-family,
6161Standards-Version: 3.9.4
@@ -70,7 +70,7 @@ X-Ubuntu-Use-Langpack: yes
7070Package: indicators-client
7171Architecture: amd64 armhf i386
7272Depends: qmenumodel-qml (>= 0.2.9),
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),
7474 unity8 (= ${binary:Version}),
7575 ${misc:Depends},
7676 ${shlibs:Depends},
@@ -128,7 +128,7 @@ Architecture: all
128128Depends: qml-module-qtquick-layouts,
129129 qtdeclarative5-ubuntu-settings-components (>= 0.7),
130130 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
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),
132132 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
133133 ubuntu-thumbnailer-impl-0,
134134 unity-application-impl-13,
@@ -158,7 +158,7 @@ Depends: autopilot-qt5 (>= 1.4),
158158 python3-fixtures,
159159 python3-gi,
160160 qttestability-autopilot (>= 1.4),
161− ubuntu-ui-toolkit-autopilot (>= 1.2.1485+15.04.20150417.1-0ubuntu1),
161+ ubuntu-ui-toolkit-autopilot (>= 1.3.1796),
162162 unity-scope-click,
163163 unity8 (= ${source:Version}),
164164 unity8-fake-env (= ${source:Version}),
qml/Components/Header.qml+1
@@ -18,6 +18,7 @@ import Ubuntu.Components 1.3
1818import Ubuntu.Components.Themes.Ambiance 1.3
1919
2020PageHeadStyle {
21+ // FIXME: Don't use this but PageHeader from Ubuntu.Components 1.3.
2122 id: root
2223
2324 property var styledItem: root
qml/Dash/DashPageHeader.qml+4
@@ -170,6 +170,7 @@ Item {
170170 anchors { left: parent.left; right: parent.right }
171171
172172 PageHeadStyle {
173+ // FIXME: Replace PageHeadStyle from the Ambiance theme by the new PageHeader from Ubuntu.Components 1.3.
173174 id: searchHeader
174175 anchors { left: parent.left; right: parent.right }
175176 opacity: headerContainer.clip || headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
@@ -179,6 +180,7 @@ Item {
179180 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
180181 property color panelColor: background.topColor
181182 panelForegroundColor: config.foregroundColor
183+ backgroundColor: "transparent"
182184 config: PageHeadConfiguration {
183185 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
184186 backAction: Action {
@@ -241,6 +243,7 @@ Item {
241243 }
242244
243245 PageHeadStyle {
246+ // FIXME: Replace PageHeadStyle from the Ambiance theme by the new PageHeader from Ubuntu.Components 1.3.
244247 id: header
245248 objectName: "innerPageHeader"
246249 anchors { left: parent.left; right: parent.right }
@@ -251,6 +254,7 @@ Item {
251254 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
252255 property color panelColor: background.topColor
253256 panelForegroundColor: config.foregroundColor
257+ backgroundColor: "transparent"
254258 config: PageHeadConfiguration {
255259 title: root.title
256260 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
qml/Stages/Splash.qml+2
@@ -76,6 +76,7 @@ Item {
7676 }
7777
7878 Ambiance.PageHeadStyle {
79+ // FIXME: Replace PageHeadStyle by PageHeader from Ubuntu.Components 1.3.
7980 id: header
8081 anchors {
8182 left: parent.left;
@@ -86,6 +87,7 @@ Item {
8687 property color dividerColor: Qt.darker(styledItem.backgroundColor, 1.1)
8788 property color panelColor: Qt.lighter(styledItem.backgroundColor, 1.1)
8889 panelForegroundColor: config.foregroundColor
90+ backgroundColor: "transparent"
8991 config: PageHeadConfiguration {
9092 id: headerConfig
9193 foregroundColor: styledItem.fakeTheme.palette.normal.backgroundText