@@ -40,10 +40,7 @@ Item {
4040
4141 QtObject {
4242 id: d
43− readonly property color foregroundColor: {
44− if (scopeStyle) return background.luminance > scopeStyle.threshold ? scopeStyle.dark : ScopeStyle.light;
45− else return background.luminance > 0.7 ? Theme.palette.normal.baseText : "white"
46− }
43+ readonly property color foregroundColor: scopeStyle.getTextColor(background.luminance)
4744 readonly property bool bothVisible: altNavigationButton.visible && navigationButton.visible
4845 readonly property real navigationWidth: root.width >= units.gu(60) ? units.gu(40) : root.width
4946 readonly property real buttonWidth: navigationWidth / (bothVisible ? 2 : 1)
@@ -66,7 +63,7 @@ Item {
6663
6764 Image {
6865 fillMode: Image.Stretch
69− source: scopeStyle.backgroundLuminance > 0.7 ? "graphics/navigation_shadow.png" : "graphics/navigation_shadow_light.png"
66+ source: scopeStyle.backgroundLuminance > 0.2 ? "graphics/navigation_shadow.png" : "graphics/navigation_shadow_light.png"
7067 anchors { top: parent.bottom; left: parent.left; right: parent.right }
7168 }
7269