git.iko.soy/unity8
on xenial help sign in
Move login function to Greeter
7f18c1dMichael Terry
qml/Greeter/Greeter.qml+9
compare with xenial
unifiedsplit
@@ -49,6 +49,7 @@ Showable {
49 signal selected(int uid)
49 signal selected(int uid)
50 signal unlocked(int uid)
50 signal unlocked(int uid)
51 signal tease()
51 signal tease()
52+ signal sessionStarted()
52
53
53 function hideRight() {
54 function hideRight() {
54 if (shown) {
55 if (shown) {
@@ -69,6 +70,14 @@ Showable {
69 }
70 }
70 }
71 }
71
72
73+ function login() {
74+ enabled = false;
75+ if (LightDM.Greeter.startSessionSync()) {
76+ sessionStarted();
77+ }
78+ enabled = true;
79+ }
80+
72 onRequiredChanged: {
81 onRequiredChanged: {
73 // Reset hide animation to default once we're finished with it
82 // Reset hide animation to default once we're finished with it
74 if (required) {
83 if (required) {
qml/Shell.qml+6−13
@@ -534,8 +534,6 @@ Item {
534 id: greeter
534 id: greeter
535 objectName: "greeter"
535 objectName: "greeter"
536
536
537− signal sessionStarted() // helpful for tests
538−
539 property string lockedApp: ""
537 property string lockedApp: ""
540 property bool hasLockedApp: lockedApp !== ""
538 property bool hasLockedApp: lockedApp !== ""
541
539
@@ -553,6 +551,12 @@ Item {
553
551
554 dragHandleWidth: shell.edgeSize
552 dragHandleWidth: shell.edgeSize
555
553
554+ onSessionStarted: {
555+ hide();
556+ lockscreen.hide();
557+ launcher.hide();
558+ }
559+
556 function startUnlock() {
560 function startUnlock() {
557 if (narrowMode) {
561 if (narrowMode) {
558 if (!LightDM.Greeter.authenticated) {
562 if (!LightDM.Greeter.authenticated) {
@@ -565,17 +569,6 @@ Item {
565 }
569 }
566 }
570 }
567
571
568− function login() {
569− enabled = false;
570− if (LightDM.Greeter.startSessionSync()) {
571− sessionStarted();
572− greeter.hide();
573− lockscreen.hide();
574− launcher.hide();
575− }
576− enabled = true;
577− }
578−
579 onShownChanged: {
572 onShownChanged: {
580 if (shown) {
573 if (shown) {
581 // Disable everything so that user can't swipe greeter or
574 // Disable everything so that user can't swipe greeter or