[gnome-shell] screenShield: only pop lock-screen mode at the end of lift
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] screenShield: only pop lock-screen mode at the end of lift
- Date: Sat, 2 Mar 2013 22:26:44 +0000 (UTC)
commit e6ce0057af5a5900cc71176d0b616660f848f655
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Sat Mar 2 15:21:20 2013 -0500
screenShield: only pop lock-screen mode at the end of lift
This avoids the style of the top panel changing as soon as the lift key
is pressed weakening the curtain effect.
https://bugzilla.gnome.org/show_bug.cgi?id=695023
js/ui/screenShield.js | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 7b3953b..4580814 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -864,6 +864,14 @@ const ScreenShield = new Lang.Class({
});
},
+ _hideLockScreenComplete: function() {
+ if (Main.sessionMode.currentMode == 'lock-screen')
+ Main.sessionMode.popMode('lock-screen');
+
+ this._lockScreenState = MessageTray.State.HIDDEN;
+ this._lockScreenGroup.hide();
+ },
+
_hideLockScreen: function(animate, velocity) {
if (this._lockScreenState == MessageTray.State.HIDDEN)
return;
@@ -887,21 +895,13 @@ const ScreenShield = new Lang.Class({
{ y: -h,
time: time,
transition: 'easeInQuad',
- onComplete: function() {
- this._lockScreenState = MessageTray.State.HIDDEN;
- this._lockScreenGroup.hide();
- },
- onCompleteScope: this,
+ onComplete: Lang.bind(this, this._hideLockScreenComplete),
});
} else {
- this._lockScreenState = MessageTray.State.HIDDEN;
- this._lockScreenGroup.hide();
+ this._hideLockScreenComplete();
}
global.stage.show_cursor();
-
- if (Main.sessionMode.currentMode == 'lock-screen')
- Main.sessionMode.popMode('lock-screen');
},
_ensureUnlockDialog: function(onPrimary, allowCancel) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]