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

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 ee09c5c85312f571e14abe69bb6674a361c16d65 we are sure that
duration 0 is always preserved.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2987>
This commit is contained in:
Alessandro Bono 2023-10-21 13:42:13 +02:00 committed by Marge Bot
parent 46219b1101
commit b4676f0e9e
1 changed files with 14 additions and 18 deletions
Show Stats 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(); this._lockDialogGroup.remove_all_transitions();
if (animate) { // Animate the lock screen out of screen
// Animate the lock screen out of screen // if velocity is not specified (i.e. we come here from pressing ESC),
// if velocity is not specified (i.e. we come here from pressing ESC), // 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 const height = global.stage.height;
let h = global.stage.height; const delta = height + this._lockDialogGroup.translation_y;
let delta = h + this._lockDialogGroup.translation_y; const velocity = height / CURTAIN_SLIDE_TIME;
let velocity = global.stage.height / CURTAIN_SLIDE_TIME; const duration = animate ? delta / velocity : 0;
let duration = delta / velocity;
this._lockDialogGroup.ease({ this._lockDialogGroup.ease({
translation_y: -h, translation_y: -height,
duration, duration,
mode: Clutter.AnimationMode.EASE_OUT_QUAD, mode: Clutter.AnimationMode.EASE_OUT_QUAD,
onComplete: () => this._hideLockScreenComplete(), onComplete: () => this._hideLockScreenComplete(),
}); });
} else {
this._hideLockScreenComplete();
}
this._showPointer(); this._showPointer();
} }