edu4rdshl/gnome-shell
1
0
Fork 0
mirror of https://github.com/edu4rdshl/gnome-shell.git synced 2026-07-17 23:24:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

screenShield: Use duration 0 when not animating

Browse source 
Instead of using a special branch for the not animate case, just use
the same path with duration 0.

Since commit ee09c5c853 we are sure that
duration 0 is always preserved.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2987>
(cherry picked from commit b4676f0e9e)
This commit is contained in:
Alessandro Bono 2023-10-21 13:42:13 +02:00 • committed by Florian Müllner
parent 7d2014da71
commit ae5e8fa924
1 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

32
js/ui/screenShield.js
View file

@ -397,25 +397,21 @@ export class ScreenShield extends Signals.EventEmitter {
this._lockDialogGroup.remove_all_transitions();
if (animate) {
// Animate the lock screen out of screen
// if velocity is not specified (i.e. we come here from pressing ESC),
// use the same speed regardless of original position
// if velocity is specified, it's in pixels per milliseconds
let h = global.stage.height;
let delta = h + this._lockDialogGroup.translation_y;
let velocity = global.stage.height / CURTAIN_SLIDE_TIME;
let duration = delta / velocity;
// Animate the lock screen out of screen
// if velocity is not specified (i.e. we come here from pressing ESC),
// use the same speed regardless of original position
// if velocity is specified, it's in pixels per milliseconds
const height = global.stage.height;
const delta = height + this._lockDialogGroup.translation_y;
const velocity = height / CURTAIN_SLIDE_TIME;
const duration = animate ? delta / velocity : 0;
this._lockDialogGroup.ease({
translation_y: -h,
duration,
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
onComplete: () => this._hideLockScreenComplete(),
});
} else {
this._hideLockScreenComplete();
}
this._lockDialogGroup.ease({
translation_y: -height,
duration,
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
onComplete: () => this._hideLockScreenComplete(),
});
this._showPointer();
}