brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ScreenShield: switch resetLockScreen to accept keyword arguments

Browse Source 
Having two booleans as argument is just confusing.

https://bugzilla.gnome.org/show_bug.cgi?id=699112
This commit is contained in:
Giovanni Campagna 2013-05-12 17:32:02 +02:00
parent 8e9d91fedc
commit 32613ba544
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/ui/screenShield.js
View File

@ -979,10 +979,11 @@ const ScreenShield = new Lang.Class({
}, },
_onUnlockFailed: function() { _onUnlockFailed: function() {
this._resetLockScreen(true, false); this._resetLockScreen({ animateLockScreen: true,
animateLockDialog: false });
}, },
_resetLockScreen: function(animateLockScreen, animateLockDialog) { _resetLockScreen: function(params) {
// Don't reset the lock screen unless it is completely hidden // Don't reset the lock screen unless it is completely hidden
// This prevents the shield going down if the lock-delay timeout // This prevents the shield going down if the lock-delay timeout
// fires while the user is dragging (which has the potential // fires while the user is dragging (which has the potential
@ -997,7 +998,7 @@ const ScreenShield = new Lang.Class({
this._lockScreenGroup.show(); this._lockScreenGroup.show();
this._lockScreenState = MessageTray.State.SHOWING; this._lockScreenState = MessageTray.State.SHOWING;
if (animateLockScreen) { if (params.animateLockScreen) {
this._lockScreenGroup.y = -global.screen_height; this._lockScreenGroup.y = -global.screen_height;
Tweener.removeTweens(this._lockScreenGroup); Tweener.removeTweens(this._lockScreenGroup);
Tweener.addTween(this._lockScreenGroup, Tweener.addTween(this._lockScreenGroup,
@ -1014,7 +1015,7 @@ const ScreenShield = new Lang.Class({
this._lockScreenShown(); this._lockScreenShown();
} }
if (animateLockDialog) { if (params.animateLockDialog) {
this._lockDialogGroup.opacity = 0; this._lockDialogGroup.opacity = 0;
Tweener.removeTweens(this._lockDialogGroup); Tweener.removeTweens(this._lockDialogGroup);
Tweener.addTween(this._lockDialogGroup, Tweener.addTween(this._lockDialogGroup,
@ -1258,7 +1259,8 @@ const ScreenShield = new Lang.Class({
Main.sessionMode.pushMode('unlock-dialog'); Main.sessionMode.pushMode('unlock-dialog');
} }
this._resetLockScreen(animate, animate); this._resetLockScreen({ animateLockScreen: animate,
animateLockDialog: animate });
global.set_runtime_state(LOCKED_STATE_STR, GLib.Variant.new('b', true)); global.set_runtime_state(LOCKED_STATE_STR, GLib.Variant.new('b', true));
// We used to set isActive and emit active-changed here, // We used to set isActive and emit active-changed here,