5370a00 · unity8 · git.iko.soy

qml/Greeter/Greeter.qml+1−1

compare with xenial

unifiedsplit

@@ -56,7 +56,7 @@ Showable {

56 readonly property bool animating: loader.item ? loader.item.animating : false

57

58 property string sessionToStart: {

59− if (loader.item.sessionToStart) {

59+ if (loader.active && loader.item.sessionToStart) {

60 return loader.item.sessionToStart

61 } else if (LightDMService.greeter.defaultSession) {

62 return LightDMService.greeter.defaultSession

qml/Greeter/WideView.qml+2−2

@@ -137,7 +137,7 @@ FocusScope {

137 // True when LoginList is shown, false when SessionList is shown

138 property bool loginListShown: true

139 property bool sessionUpdated: false

140− property string currentSession // Set as soon as LoginList is loaded

140+ property string currentSession: LightDMService.sessions.defaultSession // Set as soon as LoginList is loaded

141

142 source: loginListShown ? "LoginList.qml" : "SessionsList.qml"

143 onSourceChanged: loadingAnimation.running = true

@@ -158,7 +158,7 @@ FocusScope {

158 id: loadingAnimation

159 target: loginAreaLoader.item

160 property: "x"

161− from: loader.item.width

161+ from: loader.item ? loader.item.width : 0

162 to: 0

163 running: false

164 }

tests/qmltests/tst_OrientedShell.qml+5−4

@@ -1265,7 +1265,7 @@ Rectangle {

1265 touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY);

1266

1267 // wait until the animation has finished

1268− tryCompare(greeter, "shown", false);

1268+ //tryCompare(greeter, "shown", false);

1269 waitForRendering(greeter);

1270 }

1271

@@ -1313,10 +1313,11 @@ Rectangle {

1313 var greeter = findChild(shell, "greeter");

1314 verify(greeter);

1315

1316− var loginList = findChild(greeter, "loginList");

1316+ var greeterViewLoader = findChild(greeter, "loader").item;

1317+ var loginAreaLoader = findChild(greeterViewLoader, "loginAreaLoader");

1317 // Only present in WideView

1318 // Only present in WideView

1318− if (loginList) {

1319+ if (loginAreaLoader) {

1319− var userList = findChild(loginList, "userList");

1320+ var userList = findChild(loginAreaLoader.item, "userList");

1320 verify(userList);

1321 verify(userList);

1321 tryCompare(userList, "movingInternally", false);

1322 tryCompare(userList, "movingInternally", false);

1322 }

1323 }