From 3652002a683d2e0a66391a60961ebc00f8abce19 Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Fri, 1 Feb 2013 11:36:21 +0100 Subject: [PATCH] screenShield: Pop modes before starting unlock animation This way the top panel remains visible while the shield hiding animation is ongoing instead of suddenly appearing just when it ends. https://bugzilla.gnome.org/show_bug.cgi?id=692966 --- js/ui/screenShield.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js index 8dac44815..3da3b0181 100644 --- a/js/ui/screenShield.js +++ b/js/ui/screenShield.js @@ -1055,6 +1055,11 @@ const ScreenShield = new Lang.Class({ deactivate: function(animate) { this._hideLockScreen(animate, 0); + if (Main.sessionMode.currentMode == 'lock-screen') + Main.sessionMode.popMode('lock-screen'); + if (Main.sessionMode.currentMode == 'unlock-dialog') + Main.sessionMode.popMode('unlock-dialog'); + Tweener.addTween(this._lockDialogGroup, { scale_x: 0, scale_y: 0, @@ -1083,11 +1088,6 @@ const ScreenShield = new Lang.Class({ this.actor.hide(); - if (Main.sessionMode.currentMode == 'lock-screen') - Main.sessionMode.popMode('lock-screen'); - if (Main.sessionMode.currentMode == 'unlock-dialog') - Main.sessionMode.popMode('unlock-dialog'); - if (this._becameActiveId != 0) { this.idleMonitor.disconnect(this._becameActiveId); this._becameActiveId = 0;