git.iko.soy/unity8
on xenial help sign in
Adapt to scope colors
commita3695b5cba6dd110706efd9e70dd59298a0341e7 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateMon 14 Nov 2016, 17:13 (10 years ago) parentbd61ad5
2 files changed+3−1
compare with xenial
unifiedsplit
qml/Dash/GenericScopeView.qml+2 qml/Dash/PullToRefreshScopeStyle.qml+1−1
qml/Dash/GenericScopeView.qml+2
@@ -167,6 +167,7 @@ FocusScope {
167167 }
168168
169169 Rectangle {
170+ id: scopeBackground
170171 anchors.fill: parent
171172 color: scopeView.scopeStyle ? scopeView.scopeStyle.background : "transparent"
172173 visible: color != "transparent"
@@ -657,6 +658,7 @@ FocusScope {
657658 target: categoryView
658659
659660 readonly property real contentY: categoryView.contentY - categoryView.originY
661+ readonly property real scopeBackgroundLuminance: scopeBackground.visible ? Style.luminance(scopeBackground.color) : 1.0
660662 y: -contentY - units.gu(5)
661663
662664 onRefresh: {
qml/Dash/PullToRefreshScopeStyle.qml+1−1
@@ -48,7 +48,7 @@ PullToRefreshStyle {
4848 anchors.horizontalCenter: parent.horizontalCenter
4949 horizontalAlignment: Text.AlignHCenter
5050 verticalAlignment: Text.AlignVCenter
51− color: UbuntuColors.jet
51+ color: styledItem.scopeBackgroundLuminance < 0.3 ? UbuntuColors.porcelain : UbuntuColors.jet
5252 states: [
5353 State {
5454 name: "pulling"