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

screenShield: Only animate the unlock dialog

Browse Source 
Remove the slide-up-down animation from the lock shield.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872
This commit is contained in:
Georges Basile Stavracas Neto 2019-11-29 12:29:41 -03:00 committed by Florian Müllner
parent cd09144069
commit c1ee656c35
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/ui/screenShield.js
View File

@ -380,7 +380,7 @@ var ScreenShield = class {
this._lockScreenState = MessageTray.State.HIDING; this._lockScreenState = MessageTray.State.HIDING;
this._lockScreenGroup.remove_all_transitions(); this._lockDialogGroup.remove_all_transitions();
if (animate) { if (animate) {
// Tween the lock screen out of screen // Tween the lock screen out of screen
@ -388,16 +388,10 @@ var ScreenShield = class {
// use the same speed regardless of original position // use the same speed regardless of original position
// if velocity is specified, it's in pixels per milliseconds // if velocity is specified, it's in pixels per milliseconds
let h = global.stage.height; let h = global.stage.height;
let delta = h + this._lockScreenGroup.translation_y; let delta = h + this._lockDialogGroup.translation_y;
let velocity = global.stage.height / CURTAIN_SLIDE_TIME; let velocity = global.stage.height / CURTAIN_SLIDE_TIME;
let duration = delta / velocity; let duration = delta / velocity;
this._lockScreenGroup.ease({
translation_y: -h,
duration,
mode: Clutter.AnimationMode.EASE_IN_QUAD,
});
this._lockDialogGroup.ease({ this._lockDialogGroup.ease({
translation_y: -h, translation_y: -h,
duration, duration,
@ -460,14 +454,6 @@ var ScreenShield = class {
let fadeToBlack = params.fadeToBlack; let fadeToBlack = params.fadeToBlack;
if (params.animateLockScreen) { if (params.animateLockScreen) {
this._lockScreenGroup.translation_y = -global.screen_height;
this._lockScreenGroup.remove_all_transitions();
this._lockScreenGroup.ease({
translation_y: 0,
duration: MANUAL_FADE_TIME,
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
});
this._lockDialogGroup.translation_y = -global.screen_height; this._lockDialogGroup.translation_y = -global.screen_height;
this._lockDialogGroup.remove_all_transitions(); this._lockDialogGroup.remove_all_transitions();
this._lockDialogGroup.ease({ this._lockDialogGroup.ease({