git.iko.soy/unity8
on xenial help sign in
Make background look right for a launcher-drag too
365c2f3Michael Terry
qml/Shell.qml+11−8
compare with xenial
unifiedsplit
@@ -148,8 +148,8 @@ FocusScope {
148
148
149 available: !greeter.shown && !lockscreen.shown
149 available: !greeter.shown && !lockscreen.shown
150 hides: [stages, launcher, panel.indicators]
150 hides: [stages, launcher, panel.indicators]
151− shown: disappearingAnimationProgress !== 1.0 && greeter.showProgress !== 1.0
151+ shown: disappearingAnimationProgress !== 1.0 && greeterWrapper.showProgress !== 1.0
152− enabled: disappearingAnimationProgress === 0.0 && greeter.showProgress === 0.0 && edgeDemo.dashEnabled
152+ enabled: disappearingAnimationProgress === 0.0 && greeterWrapper.showProgress === 0.0 && edgeDemo.dashEnabled
153
153
154 anchors {
154 anchors {
155 fill: parent
155 fill: parent
@@ -362,8 +362,15 @@ FocusScope {
362 }
362 }
363 }
363 }
364
364
365+ Rectangle {
366+ anchors.fill: parent
367+ color: "black"
368+ opacity: greeterWrapper.showProgress * 0.8
369+ }
370+
365 Item {
371 Item {
366 // Just a tiny wrapper to adjust greeter's x without messing with its own dragging
372 // Just a tiny wrapper to adjust greeter's x without messing with its own dragging
373+ id: greeterWrapper
367 x: launcher.progress
374 x: launcher.progress
368 y: panel.panelHeight
375 y: panel.panelHeight
369 width: parent.width
376 width: parent.width
@@ -371,11 +378,7 @@ FocusScope {
371
378
372 Behavior on x {SmoothedAnimation{velocity: 600}}
379 Behavior on x {SmoothedAnimation{velocity: 600}}
373
380
374− Rectangle {
381+ readonly property real showProgress: x === 0.0 ? greeter.showProgress : (1 - x/width)
375− anchors.fill: parent
376− color: "black"
377− opacity: (1 - Math.abs(greeter.x) / shell.width) * 0.8
378− }
379
382
380 Greeter {
383 Greeter {
381 id: greeter
384 id: greeter
@@ -417,7 +420,7 @@ FocusScope {
417 Binding {
420 Binding {
418 target: ApplicationManager
421 target: ApplicationManager
419 property: "suspended"
422 property: "suspended"
420− value: greeter.shown && greeter.showProgress == 1
423+ value: greeter.shown && greeterWrapper.showProgress == 1
421 }
424 }
422 }
425 }
423 }
426 }