@@ -16,7 +16,9 @@
1616
1717import QtQuick 2.4
1818import Utils 0.1
19+import GSettings 1.0
1920import Ubuntu.Components 1.3
21+import Ubuntu.Components.Themes 1.3
2022
2123/*! \brief Helper for processing scope customization options.
2224
@@ -26,17 +28,22 @@ import Ubuntu.Components 1.3
2628 */
2729
2830QtObject {
31+
32+ property var gsettings: GSettings {
33+ schema.id: "com.ubuntu.touch.system-settings"
34+ }
35+
2936 /// Style object passed from the scope
3037 property var style: Object()
3138
3239 /// Color used for text and symbolic icons
33− readonly property color foreground: "foreground-color" in style ? style["foreground-color"] : d.defaultDark
40+ property color foreground: gsettings.dashBackground ? "white" : ("foreground-color" in style ? style["foreground-color"] : d.defaultDark)
3441
3542 /// Luminance of the foreground color
3643 readonly property real foregroundLuminance: foreground ? Style.luminance(foreground) : Style.luminance(d.defaultDark)
3744
3845 /// Color used for the overall background
39− readonly property color background: "background-color" in style ? style["background-color"] : "#00f5f5f5"
46+ property color background: "background-color" in style ? style["background-color"] : gsettings.dashBackground ? "transparent" : "#00f5f5f5"
4047
4148 /// Luminance of the background color
4249 readonly property real backgroundLuminance: background ? Style.luminance(background) : Style.luminance(d.defaultLight)
@@ -58,16 +65,16 @@ QtObject {
5865 readonly property url headerLogo: "logo" in d.headerStyle ? d.headerStyle["logo"] : ""
5966
6067 /// Background style for the header
61− readonly property url headerBackground: "background" in d.headerStyle ? d.headerStyle["background"] : "color:///#ffffff"
68+ property url headerBackground: "background" in d.headerStyle ? d.headerStyle["background"] : gsettings.dashBackground ? "color:///transparent" : "color:///#ffffff"
6269
6370 /// Foreground color for the header
64− readonly property color headerForeground: "foreground-color" in d.headerStyle ? d.headerStyle["foreground-color"] : foreground
71+ property color headerForeground: "foreground-color" in d.headerStyle ? d.headerStyle["foreground-color"] : gsettings.dashBackground ? "white" : foreground
6572
6673 /// Color of the header divider
67− readonly property color headerDividerColor: "divider-color" in d.headerStyle ? d.headerStyle["divider-color"] : "#e0e0e0"
74+ property color headerDividerColor: "divider-color" in d.headerStyle ? d.headerStyle["divider-color"] : gsettings.dashBackground ? "transparent" : "#e0e0e0"
6875
6976 /// Background style for the navigation
70− readonly property url navigationBackground: "navigation-background" in d.headerStyle ? d.headerStyle["navigation-background"] : "color:///#f5f5f5"
77+ property url navigationBackground: "navigation-background" in d.headerStyle ? d.headerStyle["navigation-background"] : gsettings.dashBackground ? "color:///white" : "color:///#f5f5f5"
7178
7279 /// Color of the primary preview button
7380 readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : theme.palette.normal.positive