on xenial help sign in
Make infographic bubbles white even on the default wallpaper.

Approved by: Albert Astals Cid

commit8c2752311a2ae8e9817b59b6f5be5814329c185a authorMichael Terry <michael.terry@canonical.com> dateTue 13 Sep 2016, 06:55 (10 years ago) parent6f377026b68870
3 files changed+2−14
qml/Greeter/CoverPage.qml−2 qml/Greeter/Infographics.qml+2−10 qml/Greeter/WideView.qml−2
qml/Greeter/CoverPage.qml−2
@@ -109,8 +109,6 @@ Showable {
109109 model: root.infographicModel
110110 clip: true // clip large data bubbles
111111
112− useColor: !root.hasCustomBackground
113−
114112 anchors {
115113 verticalCenter: parent.verticalCenter
116114 left: parent.left
qml/Greeter/Infographics.qml+2−10
@@ -24,7 +24,6 @@ Item {
2424 property var model
2525
2626 property int animDuration: 10
27− property bool useColor: true
2827
2928 QtObject {
3029 id: d
@@ -36,7 +35,6 @@ Item {
3635 || circleChangeAnimTimer.running
3736 }
3837
39− // Define a replacement white-based color theme when useColor is false
4038 QtObject {
4139 id: whiteTheme
4240 property color main: "white"
@@ -177,10 +175,7 @@ Item {
177175 ColorAnimation {
178176 target: pastCircle
179177 property: "color"
180− to: Gradient.threeColorByIndex(index, count,
181− useColor ?
182− infographic.model.secondColor :
183− whiteTheme)
178+ to: Gradient.threeColorByIndex(index, count, whiteTheme)
184179 easing.type: Easing.OutCurve
185180 duration: circleChangeAnimTimer.interval * d.circleModifier
186181 }
@@ -242,10 +237,7 @@ Item {
242237 ColorAnimation {
243238 target: presentCircle
244239 property: "color"
245− to: Gradient.threeColorByIndex(index, infographic.model.currentDay,
246− useColor ?
247− infographic.model.firstColor :
248− whiteTheme)
240+ to: Gradient.threeColorByIndex(index, infographic.model.currentDay, whiteTheme)
249241 easing.type: Easing.OutCurve
250242 duration: circleChangeAnimTimer.interval * d.circleModifier
251243 }
qml/Greeter/WideView.qml−2
@@ -111,8 +111,6 @@ FocusScope {
111111 infographics {
112112 height: 0.75 * parent.height
113113 anchors.leftMargin: loginList.x + loginList.width
114−
115− useColor: !root.hasCustomBackground
116114 }
117115
118116 onTease: root.tease()