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

ScreenShield: prepare the dialog when the user starts dragging

Browse Source 
This way if the user drags long enough it will see the dialog
below the curtain, and it will appear as it was always there.

https://bugzilla.gnome.org/show_bug.cgi?id=681143
This commit is contained in:
Giovanni Campagna 2012-08-07 18:07:07 +02:00
parent b33e51be45
commit 2c627cad10
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/ui/screenShield.js
View File

@ -352,7 +352,8 @@ const ScreenShield = new Lang.Class({
_onLockScreenKeyRelease: function(actor, event) { _onLockScreenKeyRelease: function(actor, event) {
if (event.get_key_symbol() == Clutter.KEY_Escape) { if (event.get_key_symbol() == Clutter.KEY_Escape) {
this._showUnlockDialog(true); this._ensureUnlockDialog();
this._hideLockScreen(true);
return true; return true;
} }
@ -374,12 +375,13 @@ const ScreenShield = new Lang.Class({
_onDragBegin: function() { _onDragBegin: function() {
Tweener.removeTweens(this._lockScreenGroup); Tweener.removeTweens(this._lockScreenGroup);
this._ensureUnlockDialog();
}, },
_onDragEnd: function(action, actor, eventX, eventY, modifiers) { _onDragEnd: function(action, actor, eventX, eventY, modifiers) {
if (this._lockScreenGroup.y < -(ARROW_DRAG_TRESHOLD * global.stage.height)) { if (this._lockScreenGroup.y < -(ARROW_DRAG_TRESHOLD * global.stage.height)) {
// Complete motion automatically // Complete motion automatically
this._showUnlockDialog(true); this._hideLockScreen(true);
} else { } else {
// restore the lock screen to its original place // restore the lock screen to its original place
// try to use the same speed as the normal animation // try to use the same speed as the normal animation
@ -394,6 +396,14 @@ const ScreenShield = new Lang.Class({
this.fixed_position_set = false; this.fixed_position_set = false;
} }
}); });
// If we have a unlock dialog, cancel it
if (this._dialog) {
this._dialog.cancel();
if (!this._keepDialog) {
this._dialog = null;
}
}
} }
}, },
@ -428,10 +438,11 @@ const ScreenShield = new Lang.Class({
showDialog: function() { showDialog: function() {
this.lock(true); this.lock(true);
this._showUnlockDialog(false); this._ensureUnlockDialog();
this._hideLockScreen(false);
}, },
_showUnlockDialog: function(animate) { _hideLockScreen: function(animate) {
if (animate) { if (animate) {
// Tween the lock screen out of screen // Tween the lock screen out of screen
// try to use the same speed regardless of original position // try to use the same speed regardless of original position
@ -442,12 +453,14 @@ const ScreenShield = new Lang.Class({
{ y: -h, { y: -h,
time: time, time: time,
transition: 'linear', transition: 'linear',
onComplete: Lang.bind(this, this._hideLockScreen), onComplete: function() { this.hide(); }
}); });
} else { } else {
this._hideLockScreen(); this._lockScreenGroup.hide();
} }
},
_ensureUnlockDialog: function() {
if (!this._dialog) { if (!this._dialog) {
[this._dialog, this._keepDialog] = Main.sessionMode.createUnlockDialog(this._lockDialogGroup); [this._dialog, this._keepDialog] = Main.sessionMode.createUnlockDialog(this._lockDialogGroup);
if (!this._dialog) { if (!this._dialog) {
@ -488,14 +501,8 @@ const ScreenShield = new Lang.Class({
this.unlock(); this.unlock();
}, },
_hideLockScreen: function() {
this._arrow.hide();
this._lockScreenGroup.hide();
},
_resetLockScreen: function(animate) { _resetLockScreen: function(animate) {
this._lockScreenGroup.show(); this._lockScreenGroup.show();
this._arrow.show();
if (animate) { if (animate) {
this._lockScreenGroup.y = -global.screen_height; this._lockScreenGroup.y = -global.screen_height;