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

screenShield: Lift the unlock dialog

Browse Source 
Instead of scaling it, lift the unlock dialog when unlocking,
and vice-versa.

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

22
js/ui/screenShield.js
View File

@ -396,6 +396,12 @@ var ScreenShield = class {
translation_y: -h, translation_y: -h,
duration, duration,
mode: Clutter.AnimationMode.EASE_IN_QUAD, mode: Clutter.AnimationMode.EASE_IN_QUAD,
});
this._lockDialogGroup.ease({
translation_y: -h,
duration,
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
onComplete: () => this._hideLockScreenComplete(), onComplete: () => this._hideLockScreenComplete(),
}); });
} else { } else {
@ -447,9 +453,6 @@ var ScreenShield = class {
if (this._lockScreenState != MessageTray.State.HIDDEN) if (this._lockScreenState != MessageTray.State.HIDDEN)
return; return;
this._lockDialogGroup.scale_x = 1;
this._lockDialogGroup.scale_y = 1;
this._lockScreenGroup.show(); this._lockScreenGroup.show();
this._lockScreenState = MessageTray.State.SHOWING; this._lockScreenState = MessageTray.State.SHOWING;
@ -462,6 +465,14 @@ var ScreenShield = class {
translation_y: 0, translation_y: 0,
duration: MANUAL_FADE_TIME, duration: MANUAL_FADE_TIME,
mode: Clutter.AnimationMode.EASE_OUT_QUAD, mode: Clutter.AnimationMode.EASE_OUT_QUAD,
});
this._lockDialogGroup.translation_y = -global.screen_height;
this._lockDialogGroup.remove_all_transitions();
this._lockDialogGroup.ease({
translation_y: 0,
duration: Overview.ANIMATION_TIME,
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
onComplete: () => { onComplete: () => {
this._lockScreenShown({ fadeToBlack, animateFade: true }); this._lockScreenShown({ fadeToBlack, animateFade: true });
}, },
@ -565,9 +576,8 @@ var ScreenShield = class {
} }
this._lockDialogGroup.ease({ this._lockDialogGroup.ease({
scale_x: 0, translation_y: -global.screen_height,
scale_y: 0, duration: Overview.ANIMATION_TIME,
duration: animate ? Overview.ANIMATION_TIME : 0,
mode: Clutter.AnimationMode.EASE_OUT_QUAD, mode: Clutter.AnimationMode.EASE_OUT_QUAD,
onComplete: () => this._completeDeactivate(), onComplete: () => this._completeDeactivate(),
}); });