@@ -40,9 +40,7 @@ Item {
40 property int paginationCount: 0
40 property int paginationCount: 0
41 property int paginationIndex: -1
41 property int paginationIndex: -1
43− // TODO We should use foreground for the icons
43+ property var scope: null
44− // of the toolbar but unfortunately Action does not have
45− // the keyColor property as Icon does :-/
46 property var scopeStyle: null
44 property var scopeStyle: null
48 signal backClicked()
46 signal backClicked()
@@ -369,18 +367,26 @@ Item {
371 // FIXME this doesn't work with solid scope backgrounds due to z-ordering
369 // FIXME this doesn't work with solid scope backgrounds due to z-ordering
372− Rectangle {
370+ Item {
373 visible: bottomBorder.visible
372 visible: bottomBorder.visible
374 anchors {
373 anchors {
375 top: bottomContainer.top
374 top: bottomContainer.top
376 left: parent.left
375 left: parent.left
377 right: parent.right
376 right: parent.right
379 height: units.dp(1)
379 height: units.dp(1)
380 opacity: 0.6
380 opacity: 0.6
382+ // FIXME this should be a shader when bottomContainer.height != 0
383+ // to support image backgrounds
385+ anchors.fill: parent
381− color: scopeStyle ?
386+ color: scopeStyle && bottomContainer.height === 0 ?
382− Qt.lighter(Qt.rgba(scopeStyle.background.r, scopeStyle.background.g, scopeStyle.background.b, 1.0), 1.2) :
387+ Qt.lighter(Qt.rgba(scopeStyle.background.r, scopeStyle.background.g, scopeStyle.background.b, 1.0), 1.2) :
383− "#CCFFFFFF"
388+ "#CCFFFFFF"