git.iko.soy/unity8
on xenial help sign in
Remove some unneeded changes for this branch, will land them separately; minor cleanup
commit95e2269cdd398ffd6dcba704f7f065d0a506a58f authorMichael Terry <michael.terry@canonical.com> dateWed 18 May 2016, 09:38 (10 years ago) parent6bb9704
9 files changed+8−31
compare with xenial
unifiedsplit
qml/Components/FadingLabel.qml+1−3 qml/Components/WallpaperResolver.qml+2−3 qml/Greeter/CoverPage.qml−8 qml/Greeter/Greeter.qml−7 qml/Greeter/GreeterPrompt.qml+4−4 qml/Greeter/LoginList.qml+1−2 qml/Greeter/NarrowView.qml−1 qml/Greeter/WideView.qml−2 qml/Shell.qml−1
qml/Components/FadingLabel.qml+1−3
@@ -19,13 +19,11 @@ import QtGraphicalEffects 1.0
1919import Ubuntu.Components 1.3
2020
2121Label {
22− id: root
23−
2422 property real fadeDistance: units.gu(8)
2523
2624 layer.enabled: contentWidth > width
2725 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))
2927
3028 fragmentShader: "
3129 varying highp vec2 qt_TexCoord0;
qml/Components/WallpaperResolver.qml+2−3
@@ -29,9 +29,8 @@ QtObject {
2929 // Users should set their UI width here.
3030 property real width
3131
32− readonly property url defaultBackground: Qt.resolvedUrl(width >= units.gu(60)
33− ? "../graphics/tablet_background.jpg"
34− : "../graphics/phone_background.jpg")
32+ property url defaultBackground: Qt.resolvedUrl(width >= units.gu(60) ? "../graphics/tablet_background.jpg"
33+ : "../graphics/phone_background.jpg")
3534
3635 // That's the property users of this component are going to consume.
3736 readonly property url background: asImageTester.status == Image.Ready ? asImageTester.source
qml/Greeter/CoverPage.qml−8
@@ -28,7 +28,6 @@ Showable {
2828 property real backgroundTopMargin
2929 property var infographicModel
3030 property bool draggable: true
31− property bool blur
3231
3332 property alias infographics: infographics
3433
@@ -89,13 +88,6 @@ Showable {
8988 sourceSize.width: width
9089 }
9190
92− // FIXME
93− /*BlurLayer {
94− anchors.fill: greeterBackground
95− source: greeterBackground
96− blurRadius: 60
97− }*/
98−
9991 // Darkens wallpaper so that we can read text on it and see infographic
10092 Rectangle {
10193 anchors.fill: parent
qml/Greeter/Greeter.qml−7
@@ -30,7 +30,6 @@ Showable {
3030 property real dragHandleLeftMargin: 0
3131
3232 property url background
33− property bool customBackground
3433
3534 // How far to offset the top greeter layer during a launcher left-drag
3635 property real launcherOffset
@@ -334,12 +333,6 @@ Showable {
334333 value: root.background
335334 }
336335
337− Binding {
338− target: loader.item
339− property: "customBackground"
340− value: root.customBackground
341− }
342−
343336 Binding {
344337 target: loader.item
345338 property: "locked"
qml/Greeter/GreeterPrompt.qml+4−4
@@ -19,7 +19,7 @@ import Ubuntu.Components 1.3
1919
2020FocusScope {
2121 id: root
22− implicitHeight: units.gu(4.5)
22+ implicitHeight: units.gu(4)
2323
2424 property bool isPrompt
2525 property bool isAlphanumeric
@@ -69,11 +69,11 @@ FocusScope {
6969
7070 style: Item {
7171 property color color: UbuntuColors.porcelain
72− property color selectedTextColor: styledItem.enabled ? theme.palette.selected.selectionText : theme.palette.disabled.selectionText
73− property color selectionColor: styledItem.enabled ? theme.palette.selected.selection : theme.palette.disabled.selection
72+ property color selectedTextColor: UbuntuColors.jet
73+ property color selectionColor: UbuntuColors.porcelain
7474 property color borderColor: "transparent"
7575 property color backgroundColor: "transparent"
76− property color errorColor: styledItem.enabled ? theme.palette.normal.negative : theme.palette.disabled.negative
76+ property color errorColor: UbuntuColors.red
7777 property real frameSpacing: units.gu(0.5)
7878 anchors.fill: parent
7979
qml/Greeter/LoginList.qml+1−2
@@ -200,7 +200,7 @@ Item {
200200 }
201201 }
202202
203− Label {
203+ FadingLabel {
204204 id: infoLabel
205205 objectName: "infoLabel"
206206 anchors {
@@ -216,7 +216,6 @@ Item {
216216 width: root.width - anchors.leftMargin - anchors.rightMargin
217217 fontSize: "small"
218218 textFormat: Text.StyledText
219− clip: true
220219
221220 opacity: (userList.movingInternally || text == "") ? 0 : 1
222221 Behavior on opacity {
qml/Greeter/NarrowView.qml−1
@@ -27,7 +27,6 @@ FocusScope {
2727 property alias delayMinutes: lockscreen.delayMinutes
2828 property alias backgroundTopMargin: coverPage.backgroundTopMargin
2929 property url background
30− property bool customBackground // unused
3130 property bool locked
3231 property bool alphanumeric
3332 property var userModel // unused
qml/Greeter/WideView.qml−2
@@ -26,7 +26,6 @@ FocusScope {
2626 property int delayMinutes // TODO
2727 property alias backgroundTopMargin: coverPage.backgroundTopMargin
2828 property alias background: coverPage.background
29− property bool customBackground
3029 property bool locked
3130 property alias alphanumeric: loginList.alphanumeric
3231 property alias userModel: loginList.model
@@ -99,7 +98,6 @@ FocusScope {
9998 height: parent.height
10099 width: parent.width
101100 draggable: !root.locked
102− blur: root.customBackground
103101
104102 infographics {
105103 height: 0.75 * parent.height
qml/Shell.qml−1
@@ -420,7 +420,6 @@ Item {
420420 launcherOffset: launcher.progress
421421 forcedUnlock: wizard.active
422422 background: wallpaperResolver.background
423− customBackground: wallpaperResolver.background != wallpaperResolver.defaultBackground
424423
425424 // avoid overlapping with Launcher's edge drag area
426425 // FIXME: Fix TouchRegistry & friends and remove this workaround