e5dd762 · unity8 · git.iko.soy

qml/Components/PinLockscreen.qml+1−1

@@ -130,7 +130,7 @@ Column {

130 color: "#f3f3e7"

131 }

132

133− opacity: (pinentryField.text.length && !pinentryField.incorrectOverride) > 0 ? 1 : 0

133+ opacity: (pinentryField.text.length > 0 && !pinentryField.incorrectOverride) ? 1 : 0

134

135 Behavior on opacity {

136 UbuntuNumberAnimation {}

qml/Greeter/CoverPage.qml+2−1

@@ -47,13 +47,14 @@ Showable {

47 }

48

49 prepareToHide: function () {

50+ hideTranslation.from = root.x + translation.x

50 hideTranslation.to = root.x > 0 || d.forceRightOnNextHideAnimation ? root.width : -root.width;

51 hideTranslation.to = root.x > 0 || d.forceRightOnNextHideAnimation ? root.width : -root.width;

51 d.forceRightOnNextHideAnimation = false;

52 d.forceRightOnNextHideAnimation = false;

52 }

53 }

53

54

54 // We don't directly bind "x" because that's owned by the DragHandle. So

55 // We don't directly bind "x" because that's owned by the DragHandle. So

55 // instead, we can get a little extra horizontal push by using transforms.

56 // 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 }

57

58

58 Rectangle {

59 Rectangle {

59 // In case background fails to load

60 // In case background fails to load

qml/Greeter/Greeter.qml+1−1

@@ -185,7 +185,7 @@ Showable {

185 anchors.fill: parent

186

187 active: root.required

188− source: root.viewSource ? root.viewSource :

188+ source: root.viewSource.toString() ? root.viewSource :

189 (d.multiUser || root.tabletMode) ? "WideView.qml" : "NarrowView.qml"

190

191 onLoaded: {