loginScreen: reset greeter when coming back to login screen
When a user logs in to a wayland session, we keep the login screen running on the X server with the login screen running in a deactivated mode. This commit makes sure it get reactivated when the user comes back to the VT (from user switching, logout or just ctrl-alt-f1). https://bugzilla.gnome.org/show_bug.cgi?id=726989
This commit is contained in:
parent
e634b49859
commit
be291ee4f9
@ -36,6 +36,7 @@ const BoxPointer = imports.ui.boxpointer;
|
|||||||
const CtrlAltTab = imports.ui.ctrlAltTab;
|
const CtrlAltTab = imports.ui.ctrlAltTab;
|
||||||
const GdmUtil = imports.gdm.util;
|
const GdmUtil = imports.gdm.util;
|
||||||
const Layout = imports.ui.layout;
|
const Layout = imports.ui.layout;
|
||||||
|
const LoginManager = imports.misc.loginManager;
|
||||||
const Main = imports.ui.main;
|
const Main = imports.ui.main;
|
||||||
const PopupMenu = imports.ui.popupMenu;
|
const PopupMenu = imports.ui.popupMenu;
|
||||||
const Realmd = imports.gdm.realmd;
|
const Realmd = imports.gdm.realmd;
|
||||||
@ -472,6 +473,8 @@ const LoginDialog = new Lang.Class({
|
|||||||
this._disableUserList = undefined;
|
this._disableUserList = undefined;
|
||||||
this._userListLoaded = false;
|
this._userListLoaded = false;
|
||||||
|
|
||||||
|
LoginManager.getLoginManager().getCurrentSessionProxy(Lang.bind(this, this._gotGreeterSessionProxy));
|
||||||
|
|
||||||
// If the user list is enabled, it should take key focus; make sure the
|
// If the user list is enabled, it should take key focus; make sure the
|
||||||
// screen shield is initialized first to prevent it from stealing the
|
// screen shield is initialized first to prevent it from stealing the
|
||||||
// focus later
|
// focus later
|
||||||
@ -635,6 +638,36 @@ const LoginDialog = new Lang.Class({
|
|||||||
this._showPrompt();
|
this._showPrompt();
|
||||||
},
|
},
|
||||||
|
|
||||||
|
_loginScreenSessionActivated: function() {
|
||||||
|
if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.VERIFICATION_SUCCEEDED)
|
||||||
|
return;
|
||||||
|
|
||||||
|
Tweener.addTween(this.actor,
|
||||||
|
{ opacity: 255,
|
||||||
|
time: _FADE_ANIMATION_TIME,
|
||||||
|
transition: 'easeOutQuad',
|
||||||
|
onUpdate: function() {
|
||||||
|
let children = Main.layoutManager.uiGroup.get_children();
|
||||||
|
|
||||||
|
for (let i = 0; i < children.length; i++) {
|
||||||
|
if (children[i] != Main.layoutManager.screenShieldGroup)
|
||||||
|
children[i].opacity = this.actor.opacity;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
onUpdateScope: this,
|
||||||
|
onComplete: function() {
|
||||||
|
this._authPrompt.reset();
|
||||||
|
},
|
||||||
|
onCompleteScope: this });
|
||||||
|
},
|
||||||
|
|
||||||
|
_gotGreeterSessionProxy: function(proxy) {
|
||||||
|
proxy.connect('g-properties-changed', Lang.bind(this, function() {
|
||||||
|
if (proxy.Active)
|
||||||
|
this._loginScreenSessionActivated();
|
||||||
|
}));
|
||||||
|
},
|
||||||
|
|
||||||
_startSession: function(serviceName) {
|
_startSession: function(serviceName) {
|
||||||
Tweener.addTween(this.actor,
|
Tweener.addTween(this.actor,
|
||||||
{ opacity: 0,
|
{ opacity: 0,
|
||||||
|
@ -39,6 +39,7 @@ const SystemdLoginSessionIface = '<node> \
|
|||||||
<interface name="org.freedesktop.login1.Session"> \
|
<interface name="org.freedesktop.login1.Session"> \
|
||||||
<signal name="Lock" /> \
|
<signal name="Lock" /> \
|
||||||
<signal name="Unlock" /> \
|
<signal name="Unlock" /> \
|
||||||
|
<property name="Active" type="b" access="read" /> \
|
||||||
</interface> \
|
</interface> \
|
||||||
</node>';
|
</node>';
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user