git.iko.soy/unity8
on xenial help sign in
Make infographic bubbles white even on the default wallpaper.
8c27523Michael Terry
qml/Greeter/CoverPage.qml−2
compare with xenial
unifiedsplit
@@ -109,8 +109,6 @@ Showable {
109 model: root.infographicModel
109 model: root.infographicModel
110 clip: true // clip large data bubbles
110 clip: true // clip large data bubbles
111
111
112− useColor: !root.hasCustomBackground
113−
114 anchors {
112 anchors {
115 verticalCenter: parent.verticalCenter
113 verticalCenter: parent.verticalCenter
116 left: parent.left
114 left: parent.left
qml/Greeter/Infographics.qml+2−10
@@ -24,7 +24,6 @@ Item {
24 property var model
24 property var model
25
25
26 property int animDuration: 10
26 property int animDuration: 10
27− property bool useColor: true
28
27
29 QtObject {
28 QtObject {
30 id: d
29 id: d
@@ -36,7 +35,6 @@ Item {
36 || circleChangeAnimTimer.running
35 || circleChangeAnimTimer.running
37 }
36 }
38
37
39− // Define a replacement white-based color theme when useColor is false
40 QtObject {
38 QtObject {
41 id: whiteTheme
39 id: whiteTheme
42 property color main: "white"
40 property color main: "white"
@@ -177,10 +175,7 @@ Item {
177 ColorAnimation {
175 ColorAnimation {
178 target: pastCircle
176 target: pastCircle
179 property: "color"
177 property: "color"
180− to: Gradient.threeColorByIndex(index, count,
178+ to: Gradient.threeColorByIndex(index, count, whiteTheme)
181− useColor ?
182− infographic.model.secondColor :
183− whiteTheme)
184 easing.type: Easing.OutCurve
179 easing.type: Easing.OutCurve
185 duration: circleChangeAnimTimer.interval * d.circleModifier
180 duration: circleChangeAnimTimer.interval * d.circleModifier
186 }
181 }
@@ -242,10 +237,7 @@ Item {
242 ColorAnimation {
237 ColorAnimation {
243 target: presentCircle
238 target: presentCircle
244 property: "color"
239 property: "color"
245− to: Gradient.threeColorByIndex(index, infographic.model.currentDay,
240+ to: Gradient.threeColorByIndex(index, infographic.model.currentDay, whiteTheme)
246− useColor ?
247− infographic.model.firstColor :
248− whiteTheme)
249 easing.type: Easing.OutCurve
241 easing.type: Easing.OutCurve
250 duration: circleChangeAnimTimer.interval * d.circleModifier
242 duration: circleChangeAnimTimer.interval * d.circleModifier
251 }
243 }
qml/Greeter/WideView.qml−2
@@ -111,8 +111,6 @@ FocusScope {
111 infographics {
111 infographics {
112 height: 0.75 * parent.height
112 height: 0.75 * parent.height
113 anchors.leftMargin: loginList.x + loginList.width
113 anchors.leftMargin: loginList.x + loginList.width
114−
115− useColor: !root.hasCustomBackground
116 }
114 }
117
115
118 onTease: root.tease()
116 onTease: root.tease()