git.iko.soy/unity8
on xenial help sign in
Replace blur on greeter with darkening
9fdc9f8Capsia
qml/Greeter/CoverPage.qml+1−30
compare with xenial
unifiedsplit
@@ -29,6 +29,7 @@ Showable {
29 property alias background: greeterBackground.source
29 property alias background: greeterBackground.source
30 property alias backgroundSourceSize: greeterBackground.sourceSize
30 property alias backgroundSourceSize: greeterBackground.sourceSize
31 property alias hasCustomBackground: backgroundShade.visible
31 property alias hasCustomBackground: backgroundShade.visible
32+ property alias backgroundShadeOpacity: backgroundShade.opacity
32 property real panelHeight
33 property real panelHeight
33 property var infographicModel
34 property var infographicModel
34 property bool draggable: true
35 property bool draggable: true
@@ -39,12 +40,6 @@ Showable {
39 property real infographicsRightMargin: 0
40 property real infographicsRightMargin: 0
40 property real infographicsBottomMargin: 0
41 property real infographicsBottomMargin: 0
41
42
42− property alias blurAreaHeight: loginBoxEffects.height
43− property alias blurAreaWidth: loginBoxEffects.width
44− property alias blurAreaX: loginBoxEffects.x
45− property alias blurAreaY: loginBoxEffects.y
46− property alias blurRadius: loginBoxBlur.radius
47−
48 readonly property real showProgress: MathUtils.clamp((width - Math.abs(x + launcherOffset)) / width, 0, 1)
43 readonly property real showProgress: MathUtils.clamp((width - Math.abs(x + launcherOffset)) / width, 0, 1)
49
44
50 signal tease()
45 signal tease()
@@ -104,36 +99,12 @@ Showable {
104 }
99 }
105 }
100 }
106
101
107− Rectangle {
108− id: loginBoxEffects
109− color: "transparent"
110− }
111−
112− ShaderEffectSource {
113− id: effectSource
114−
115− sourceItem: greeterBackground
116− anchors.centerIn: loginBoxEffects
117− width: loginBoxEffects.width
118− height: loginBoxEffects.height
119− sourceRect: Qt.rect(x,y, width, height)
120− }
121−
122− FastBlur {
123− id: loginBoxBlur
124− visible: !draggable
125− anchors.fill: effectSource
126− source: effectSource
127− transparentBorder: true
128− }
129−
130 // Darkens wallpaper so that we can read text on it and see infographic
102 // Darkens wallpaper so that we can read text on it and see infographic
131 Rectangle {
103 Rectangle {
132 id: backgroundShade
104 id: backgroundShade
133 objectName: "backgroundShade"
105 objectName: "backgroundShade"
134 anchors.fill: parent
106 anchors.fill: parent
135 color: "black"
107 color: "black"
136− opacity: 0.4
137 visible: false
108 visible: false
138 }
109 }
139
110
qml/Greeter/GreeterView.qml+2−6
@@ -132,16 +132,11 @@ FocusScope {
132 draggable: false
132 draggable: false
133 state: "LoginList"
133 state: "LoginList"
134
134
135− blurAreaHeight: loginList.highlightedHeight + units.gu(4.5)
136− blurAreaWidth: loginList.width + units.gu(3)
137− blurAreaX: loginList.x - units.gu(1.5)
138− blurAreaY: loginList.boxVerticalOffset + loginList.y - units.gu(3)
139− blurRadius: root.usageMode != "phone" && root.usageMode != "tablet" ? 64 : 0
140−
141 background: root.background
135 background: root.background
142 backgroundSourceSize: root.backgroundSourceSize
136 backgroundSourceSize: root.backgroundSourceSize
143 panelHeight: root.panelHeight
137 panelHeight: root.panelHeight
144 hasCustomBackground: root.hasCustomBackground
138 hasCustomBackground: root.hasCustomBackground
139+ backgroundShadeOpacity: 0.6
145
140
146 showInfographic: root.usageMode != "phone" && isLandscape && !delayedLockscreen.visible
141 showInfographic: root.usageMode != "phone" && isLandscape && !delayedLockscreen.visible
147 infographicModel: root.infographicModel
142 infographicModel: root.infographicModel
@@ -352,6 +347,7 @@ FocusScope {
352 width: parent.width
347 width: parent.width
353 background: root.background
348 background: root.background
354 hasCustomBackground: root.hasCustomBackground
349 hasCustomBackground: root.hasCustomBackground
350+ backgroundShadeOpacity: 0.4
355 panelHeight: root.panelHeight
351 panelHeight: root.panelHeight
356 draggable: !root.waiting
352 draggable: !root.waiting
357 onTease: root.tease()
353 onTease: root.tease()