screenShield: Always show session's unlock dialog

Instead of destroying the dialog when the screen shield is
visible, and creating it when lifting the shield, always show
the session's unlock dialog.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872
This commit is contained in:
Georges Basile Stavracas Neto 2019-11-28 19:30:02 -03:00
parent e3f87bac23
commit a6897c5f90

View File

@ -566,11 +566,6 @@ var ScreenShield = class {
} }
_lockScreenShown(params) { _lockScreenShown(params) {
if (this._dialog && !this._isGreeter) {
this._dialog.destroy();
this._dialog = null;
}
let motionId = global.stage.connect('captured-event', (stage, event) => { let motionId = global.stage.connect('captured-event', (stage, event) => {
if (event.type() == Clutter.EventType.MOTION) { if (event.type() == Clutter.EventType.MOTION) {
this._cursorTracker.set_pointer_visible(true); this._cursorTracker.set_pointer_visible(true);
@ -699,6 +694,8 @@ var ScreenShield = class {
if (this._activationTime == 0) if (this._activationTime == 0)
this._activationTime = GLib.get_monotonic_time(); this._activationTime = GLib.get_monotonic_time();
this._ensureUnlockDialog(true);
this.actor.show(); this.actor.show();
if (Main.sessionMode.currentMode != 'unlock-dialog' && if (Main.sessionMode.currentMode != 'unlock-dialog' &&