git.iko.soy/unity8
on xenial help sign in
Merge pull request #424 from capsia37/remove-blur
e1dbf76Alfred E. Neumayer
qml/Greeter/CoverPage.qml+18−40
compare with xenial
unifiedsplit
@@ -29,22 +29,17 @@ 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
35
36
36− property alias showInfographic: infographicsLoader.active
37+ property bool showInfographic: false
37 property real infographicsLeftMargin: 0
38 property real infographicsLeftMargin: 0
38 property real infographicsTopMargin: 0
39 property real infographicsTopMargin: 0
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,48 +99,17 @@ 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
140− Loader {
111+ Item {
141− id: infographicsLoader
112+ id: infographicsArea
142− objectName: "infographicsLoader"
143− sourceComponent:Infographics {
144− id: infographics
145− objectName: "infographics"
146− model: root.infographicModel
147− clip: true // clip large data bubbles
148− }
149
113
150 anchors {
114 anchors {
151 leftMargin: root.infographicsLeftMargin
115 leftMargin: root.infographicsLeftMargin
@@ -159,6 +123,20 @@ Showable {
159 }
123 }
160 }
124 }
161
125
126+ Loader {
127+ id: infographicsLoader
128+ objectName: "infographicsLoader"
129+ active: root.showInfographic && infographicsArea.width > units.gu(32)
130+ anchors.fill: infographicsArea
131+
132+ sourceComponent:Infographics {
133+ id: infographics
134+ objectName: "infographics"
135+ model: root.infographicModel
136+ clip: true // clip large data bubbles
137+ }
138+ }
139+
162 Label {
140 Label {
163 id: swipeHint
141 id: swipeHint
164 objectName: "swipeHint"
142 objectName: "swipeHint"
qml/Greeter/GreeterView.qml+4−8
@@ -132,18 +132,13 @@ 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: isLandscape && root.usageMode != "phone" && (root.usageMode != "tablet" || root.multiUser) && !delayedLockscreen.visible
147 infographicModel: root.infographicModel
142 infographicModel: root.infographicModel
148
143
149 shown: false
144 shown: false
@@ -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()
@@ -359,7 +355,7 @@ FocusScope {
359 backgroundSourceSize: root.backgroundSourceSize
355 backgroundSourceSize: root.backgroundSourceSize
360 infographicModel: root.infographicModel
356 infographicModel: root.infographicModel
361
357
362− showInfographic: !root.multiUser && (!isLandscape || root.usageMode == "phone")
358+ showInfographic: !root.multiUser && root.usageMode != "desktop"
363
359
364 onShowProgressChanged: {
360 onShowProgressChanged: {
365 if (showProgress === 0) {
361 if (showProgress === 0) {
qml/Greeter/PinPrompt.qml+1−1
@@ -166,7 +166,7 @@ FocusScope {
166 // the user to be able to edit the field (simply because it would look
166 // the user to be able to edit the field (simply because it would look
167 // weird if we allowed that). But until we have such a disabled mode,
167 // weird if we allowed that). But until we have such a disabled mode,
168 // we'll fake it by covering the real text field with a label.
168 // we'll fake it by covering the real text field with a label.
169− FadingLabel {
169+ Label {
170 id: fakeLabel
170 id: fakeLabel
171 anchors.verticalCenter: extraIcons ? extraIcons.verticalCenter : undefined
171 anchors.verticalCenter: extraIcons ? extraIcons.verticalCenter : undefined
172 anchors.left: extraIcons ? extraIcons.left : undefined
172 anchors.left: extraIcons ? extraIcons.left : undefined
tests/qmltests/Greeter/tst_GreeterView.qml+2−2
@@ -1295,8 +1295,8 @@ StyledItem {
1295 multiUser: false,
1295 multiUser: false,
1296 usageMode: "tablet",
1296 usageMode: "tablet",
1297 orientation: Qt.LandscapeOrientation,
1297 orientation: Qt.LandscapeOrientation,
1298− coverPage: false,
1298+ coverPage: true,
1299− lockscreen: true
1299+ lockscreen: false
1300 },
1300 },
1301 {
1301 {
1302 tag: "tablet-landscape-multiuser",
1302 tag: "tablet-landscape-multiuser",