git.iko.soy/unity8
on xenial help sign in
Remove some unneeded changes for this branch, will land them separately; minor cleanup
95e2269Michael Terry
qml/Components/FadingLabel.qml+1−3
compare with xenial
unifiedsplit
@@ -19,13 +19,11 @@ import QtGraphicalEffects 1.0
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20
20
21Label {
21Label {
22− id: root
23−
24 property real fadeDistance: units.gu(8)
22 property real fadeDistance: units.gu(8)
25
23
26 layer.enabled: contentWidth > width
24 layer.enabled: contentWidth > width
27 layer.effect: ShaderEffect {
25 layer.effect: ShaderEffect {
28− property real fadeThreshold: Math.min(1, Math.max(0, 1 - fadeDistance / root.width))
26+ property real fadeThreshold: Math.min(1, Math.max(0, 1 - fadeDistance / width))
29
27
30 fragmentShader: "
28 fragmentShader: "
31 varying highp vec2 qt_TexCoord0;
29 varying highp vec2 qt_TexCoord0;
qml/Components/WallpaperResolver.qml+2−3
@@ -29,9 +29,8 @@ QtObject {
29 // Users should set their UI width here.
29 // Users should set their UI width here.
30 property real width
30 property real width
31
31
32− readonly property url defaultBackground: Qt.resolvedUrl(width >= units.gu(60)
32+ property url defaultBackground: Qt.resolvedUrl(width >= units.gu(60) ? "../graphics/tablet_background.jpg"
33− ? "../graphics/tablet_background.jpg"
34− : "../graphics/phone_background.jpg")
33+ : "../graphics/phone_background.jpg")
35
34
36 // That's the property users of this component are going to consume.
35 // That's the property users of this component are going to consume.
37 readonly property url background: asImageTester.status == Image.Ready ? asImageTester.source
36 readonly property url background: asImageTester.status == Image.Ready ? asImageTester.source
qml/Greeter/CoverPage.qml−8
@@ -28,7 +28,6 @@ Showable {
28 property real backgroundTopMargin
28 property real backgroundTopMargin
29 property var infographicModel
29 property var infographicModel
30 property bool draggable: true
30 property bool draggable: true
31− property bool blur
32
31
33 property alias infographics: infographics
32 property alias infographics: infographics
34
33
@@ -89,13 +88,6 @@ Showable {
89 sourceSize.width: width
88 sourceSize.width: width
90 }
89 }
91
90
92− // FIXME
93− /*BlurLayer {
94− anchors.fill: greeterBackground
95− source: greeterBackground
96− blurRadius: 60
97− }*/
98−
99 // Darkens wallpaper so that we can read text on it and see infographic
91 // Darkens wallpaper so that we can read text on it and see infographic
100 Rectangle {
92 Rectangle {
101 anchors.fill: parent
93 anchors.fill: parent
qml/Greeter/Greeter.qml−7
@@ -30,7 +30,6 @@ Showable {
30 property real dragHandleLeftMargin: 0
30 property real dragHandleLeftMargin: 0
31
31
32 property url background
32 property url background
33− property bool customBackground
34
33
35 // How far to offset the top greeter layer during a launcher left-drag
34 // How far to offset the top greeter layer during a launcher left-drag
36 property real launcherOffset
35 property real launcherOffset
@@ -334,12 +333,6 @@ Showable {
334 value: root.background
333 value: root.background
335 }
334 }
336
335
337− Binding {
338− target: loader.item
339− property: "customBackground"
340− value: root.customBackground
341− }
342−
343 Binding {
336 Binding {
344 target: loader.item
337 target: loader.item
345 property: "locked"
338 property: "locked"
qml/Greeter/GreeterPrompt.qml+4−4
@@ -19,7 +19,7 @@ import Ubuntu.Components 1.3
19
19
20FocusScope {
20FocusScope {
21 id: root
21 id: root
22− implicitHeight: units.gu(4.5)
22+ implicitHeight: units.gu(4)
23
23
24 property bool isPrompt
24 property bool isPrompt
25 property bool isAlphanumeric
25 property bool isAlphanumeric
@@ -69,11 +69,11 @@ FocusScope {
69
69
70 style: Item {
70 style: Item {
71 property color color: UbuntuColors.porcelain
71 property color color: UbuntuColors.porcelain
72− property color selectedTextColor: styledItem.enabled ? theme.palette.selected.selectionText : theme.palette.disabled.selectionText
72+ property color selectedTextColor: UbuntuColors.jet
73− property color selectionColor: styledItem.enabled ? theme.palette.selected.selection : theme.palette.disabled.selection
73+ property color selectionColor: UbuntuColors.porcelain
74 property color borderColor: "transparent"
74 property color borderColor: "transparent"
75 property color backgroundColor: "transparent"
75 property color backgroundColor: "transparent"
76− property color errorColor: styledItem.enabled ? theme.palette.normal.negative : theme.palette.disabled.negative
76+ property color errorColor: UbuntuColors.red
77 property real frameSpacing: units.gu(0.5)
77 property real frameSpacing: units.gu(0.5)
78 anchors.fill: parent
78 anchors.fill: parent
79
79
qml/Greeter/LoginList.qml+1−2
@@ -200,7 +200,7 @@ Item {
200 }
200 }
201 }
201 }
202
202
203− Label {
203+ FadingLabel {
204 id: infoLabel
204 id: infoLabel
205 objectName: "infoLabel"
205 objectName: "infoLabel"
206 anchors {
206 anchors {
@@ -216,7 +216,6 @@ Item {
216 width: root.width - anchors.leftMargin - anchors.rightMargin
216 width: root.width - anchors.leftMargin - anchors.rightMargin
217 fontSize: "small"
217 fontSize: "small"
218 textFormat: Text.StyledText
218 textFormat: Text.StyledText
219− clip: true
220
219
221 opacity: (userList.movingInternally || text == "") ? 0 : 1
220 opacity: (userList.movingInternally || text == "") ? 0 : 1
222 Behavior on opacity {
221 Behavior on opacity {
qml/Greeter/NarrowView.qml−1
@@ -27,7 +27,6 @@ FocusScope {
27 property alias delayMinutes: lockscreen.delayMinutes
27 property alias delayMinutes: lockscreen.delayMinutes
28 property alias backgroundTopMargin: coverPage.backgroundTopMargin
28 property alias backgroundTopMargin: coverPage.backgroundTopMargin
29 property url background
29 property url background
30− property bool customBackground // unused
31 property bool locked
30 property bool locked
32 property bool alphanumeric
31 property bool alphanumeric
33 property var userModel // unused
32 property var userModel // unused
qml/Greeter/WideView.qml−2
@@ -26,7 +26,6 @@ FocusScope {
26 property int delayMinutes // TODO
26 property int delayMinutes // TODO
27 property alias backgroundTopMargin: coverPage.backgroundTopMargin
27 property alias backgroundTopMargin: coverPage.backgroundTopMargin
28 property alias background: coverPage.background
28 property alias background: coverPage.background
29− property bool customBackground
30 property bool locked
29 property bool locked
31 property alias alphanumeric: loginList.alphanumeric
30 property alias alphanumeric: loginList.alphanumeric
32 property alias userModel: loginList.model
31 property alias userModel: loginList.model
@@ -99,7 +98,6 @@ FocusScope {
99 height: parent.height
98 height: parent.height
100 width: parent.width
99 width: parent.width
101 draggable: !root.locked
100 draggable: !root.locked
102− blur: root.customBackground
103
101
104 infographics {
102 infographics {
105 height: 0.75 * parent.height
103 height: 0.75 * parent.height
qml/Shell.qml−1
@@ -420,7 +420,6 @@ Item {
420 launcherOffset: launcher.progress
420 launcherOffset: launcher.progress
421 forcedUnlock: wizard.active
421 forcedUnlock: wizard.active
422 background: wallpaperResolver.background
422 background: wallpaperResolver.background
423− customBackground: wallpaperResolver.background != wallpaperResolver.defaultBackground
424
423
425 // avoid overlapping with Launcher's edge drag area
424 // avoid overlapping with Launcher's edge drag area
426 // FIXME: Fix TouchRegistry & friends and remove this workaround
425 // FIXME: Fix TouchRegistry & friends and remove this workaround