git.iko.soy/unity8
on xenial help sign in
Misc small fixes
commite5dd76286714218652e3ab7ba899b4d0ce8bf432 authorMichael Terry <michael.terry@canonical.com> dateThu 29 Jan 2015, 17:32 (12 years ago) parent558e6ae
3 files changed+4−3
compare with xenial
unifiedsplit
qml/Components/PinLockscreen.qml+1−1 qml/Greeter/CoverPage.qml+2−1 qml/Greeter/Greeter.qml+1−1
qml/Components/PinLockscreen.qml+1−1
@@ -130,7 +130,7 @@ Column {
130130 color: "#f3f3e7"
131131 }
132132
133− opacity: (pinentryField.text.length && !pinentryField.incorrectOverride) > 0 ? 1 : 0
133+ opacity: (pinentryField.text.length > 0 && !pinentryField.incorrectOverride) ? 1 : 0
134134
135135 Behavior on opacity {
136136 UbuntuNumberAnimation {}
qml/Greeter/CoverPage.qml+2−1
@@ -47,13 +47,14 @@ Showable {
4747 }
4848
4949 prepareToHide: function () {
50+ hideTranslation.from = root.x + translation.x
5051 hideTranslation.to = root.x > 0 || d.forceRightOnNextHideAnimation ? root.width : -root.width;
5152 d.forceRightOnNextHideAnimation = false;
5253 }
5354
5455 // We don't directly bind "x" because that's owned by the DragHandle. So
5556 // instead, we can get a little extra horizontal push by using transforms.
56− transform: Translate { x: root.draggable ? launcherOffset : 0 }
57+ transform: Translate { id: translation; x: root.draggable ? launcherOffset : 0 }
5758
5859 Rectangle {
5960 // In case background fails to load
qml/Greeter/Greeter.qml+1−1
@@ -185,7 +185,7 @@ Showable {
185185 anchors.fill: parent
186186
187187 active: root.required
188− source: root.viewSource ? root.viewSource :
188+ source: root.viewSource.toString() ? root.viewSource :
189189 (d.multiUser || root.tabletMode) ? "WideView.qml" : "NarrowView.qml"
190190
191191 onLoaded: {