on xenial help sign in
more cleanup
1bcaf72Michael Terry
qml/Greeter/Greeter.qml+2−1
@@ -141,12 +141,13 @@ Showable {
141 anchors.fill: parent
141 anchors.fill: parent
142 property var model: LightDM.Users
142 property var model: LightDM.Users
143 property int currentIndex: 0
143 property int currentIndex: 0
144+ property var infographicModel: LightDM.Infographic
144 readonly property int backgroundTopMargin: -greeter.y
145 readonly property int backgroundTopMargin: -greeter.y
145
146
146 source: loadContent ? "GreeterContent.qml" : ""
147 source: loadContent ? "GreeterContent.qml" : ""
147
148
148 onLoaded: {
149 onLoaded: {
149− greeterContentLoader.item.selected(currentIndex);
150+ selected(currentIndex);
150 }
151 }
151
152
152 Connections {
153 Connections {
qml/Greeter/GreeterContent.qml+1−1
@@ -122,7 +122,7 @@ Item {
122 property string infographicUser: AccountsService.statsWelcomeScreen ? selectedUser : ""
122 property string infographicUser: AccountsService.statsWelcomeScreen ? selectedUser : ""
123 onInfographicUserChanged: greeterContentLoader.infographicModel.username = infographicUser
123 onInfographicUserChanged: greeterContentLoader.infographicModel.username = infographicUser
124
124
125− Component.onCompleted {
125+ Component.onCompleted: {
126 selectedUser = greeterContentLoader.model.data(greeterContentLoader.currentIndex, LightDM.UserRoles.NameRole)
126 selectedUser = greeterContentLoader.model.data(greeterContentLoader.currentIndex, LightDM.UserRoles.NameRole)
127 greeterContentLoader.infographicModel.username = infographicUser
127 greeterContentLoader.infographicModel.username = infographicUser
128 greeterContentLoader.infographicModel.readyForDataChange()
128 greeterContentLoader.infographicModel.readyForDataChange()
qml/Shell.qml+8−9
@@ -655,15 +655,14 @@ Item {
655 if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
655 if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
656 !callManager.hasCalls && !edgeDemo.running) {
656 !callManager.hasCalls && !edgeDemo.running) {
657 // We don't want to simply call greeter.showNow() here, because
657 // We don't want to simply call greeter.showNow() here, because
658− // that will take too long (especially if the wallpaper image
659− // is large). Qt will delay button event handling until the
658+ // that will take too long. Qt will delay button event
660− // greeter is done loading and may think the user held down the
659+ // handling until the greeter is done loading and may think the
661− // power button the whole time, leading to a power dialog being
660+ // user held down the power button the whole time, leading to a
662− // shown. Instead, delay showing the greeter until we've
661+ // power dialog being shown. Instead, delay showing the
663− // finished handling the event. We could make the greeter load
662+ // greeter until we've finished handling the event. We could
664− // asynchronously instead, but that introduces a whole host of
663+ // make the greeter load asynchronously instead, but that
664+ // introduces a whole host of timing issues, especially with
665− // timing issues, especially with its animations. So this is
665+ // its animations. So this is simpler.
666− // simpler.
667 showGreeterDelayed.start();
666 showGreeterDelayed.start();
668 }
667 }
669 }
668 }