@@ -24,10 +24,10 @@ Item {
24 objectName: "dashNavigation"
24 objectName: "dashNavigation"
26 property var scope: null
26 property var scope: null
27+ property var scopeStyle: null
28 property alias windowWidth: blackRect.width
29 property alias windowWidth: blackRect.width
29 property alias windowHeight: blackRect.height
30 property alias windowHeight: blackRect.height
30− property var scopeStyle: null
31 readonly property var openList: {
31 readonly property var openList: {
32 if (navigationButton.showList) return navigationButton.listView;
32 if (navigationButton.showList) return navigationButton.listView;
33 if (altNavigationButton.showList) return altNavigationButton.listView;
33 if (altNavigationButton.showList) return altNavigationButton.listView;
@@ -43,7 +43,9 @@ Item {
44 QtObject {
44 QtObject {
46+ readonly property color foregroundColor: root.scopeStyle
46− readonly property color foregroundColor: scopeStyle.getTextColor(backgroundItem.luminance)
47+ ? root.scopeStyle.getTextColor(backgroundItem.luminance)
48+ : Theme.palette.normal.baseText
47 readonly property bool bothVisible: altNavigationButton.visible && navigationButton.visible
49 readonly property bool bothVisible: altNavigationButton.visible && navigationButton.visible
48 readonly property real navigationWidth: root.width >= units.gu(60) ? units.gu(40) : root.width
50 readonly property real navigationWidth: root.width >= units.gu(60) ? units.gu(40) : root.width
49 readonly property real buttonWidth: navigationWidth / (bothVisible ? 2 : 1)
51 readonly property real buttonWidth: navigationWidth / (bothVisible ? 2 : 1)
@@ -55,7 +57,7 @@ Item {
55 opacity: openList && openList.currentItem && openList.currentItem.visible ? 0.5 : 0
57 opacity: openList && openList.currentItem && openList.currentItem.visible ? 0.5 : 0
56 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
58 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
57 anchors { left: parent.left; right: parent.right }
59 anchors { left: parent.left; right: parent.right }
58− visible: opacity != 0
60+ visible: opacity > 0
61 Background {
63 Background {