From 98ab6ae70d7b4428579f1365e93f58cb8bd8aa02 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 27 Jul 2020 10:58:49 -0400 Subject: [PATCH] loginDialog: Reset auth prompt on vt switch before fade in At the moment, if a user switches to the login screen vt, the login screen fades in whatever was on screen prior, and then does a reset. It makes more sense to reset first, so we fade in what the user is going to interact with instead of what they interacted with before. Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2997 (cherry picked from commit 13137aad9db52223e8b62cecbd3456f4a7f66f04) --- js/gdm/loginDialog.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js index 16a7536ce..ef1af5d41 100644 --- a/js/gdm/loginDialog.js +++ b/js/gdm/loginDialog.js @@ -952,16 +952,15 @@ var LoginDialog = GObject.registerClass({ if (this.opacity == 255 && this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING) return; + if (this._authPrompt.verificationStatus !== AuthPrompt.AuthPromptStatus.NOT_VERIFYING) + this._authPrompt.reset(); + this._bindOpacity(); this.ease({ opacity: 255, duration: _FADE_ANIMATION_TIME, mode: Clutter.AnimationMode.EASE_OUT_QUAD, - onComplete: () => { - if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.NOT_VERIFYING) - this._authPrompt.reset(); - this._unbindOpacity(); - }, + onComplete: () => this._unbindOpacity(), }); }