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

screenShield: Stop using custom transition

Browse Source 
For animating the arrows on the screenshield, we currently use a custom
transition function that tweens the opacity from 0 to maxOpacity in the
first half of the animation, and from maxOpacity back to 0 in the second
half.

This doesn't easily translate to Clutter's own animation framework, so
replace the custom transition with two consecutive tweens which do.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/22
This commit is contained in:
Florian Müllner 2019-07-26 02:38:49 +02:00
parent 8eb88d17fe
commit 5d6db923b7
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/ui/screenShield.js
View File

@ -5,7 +5,6 @@ const { AccountsService, Clutter, Cogl, Gio, GLib,
const Cairo = imports.cairo; const Cairo = imports.cairo;
const Mainloop = imports.mainloop; const Mainloop = imports.mainloop;
const Signals = imports.signals; const Signals = imports.signals;
const TweenerEquations = imports.tweener.equations;
const Background = imports.ui.background; const Background = imports.ui.background;
const GnomeSession = imports.misc.gnomeSession; const GnomeSession = imports.misc.gnomeSession;
@ -736,14 +735,16 @@ var ScreenShield = class {
for (let i = 0; i < arrows.length; i++) { for (let i = 0; i < arrows.length; i++) {
arrows[i].opacity = 0; arrows[i].opacity = 0;
Tweener.addTween(arrows[i], Tweener.addTween(arrows[i],
{ opacity: 0, { opacity: maxOpacity,
delay: (unitaryDelay * (N_ARROWS - (i + 1))) / 1000, delay: (unitaryDelay * (N_ARROWS - (i + 1))) / 1000,
time: ARROW_ANIMATION_TIME / 1000, time: ARROW_ANIMATION_TIME / (2 * 1000),
transition(t, b, c, d) { transition: 'easeOutQuad',
if (t < d / 2) onComplete: () => {
return TweenerEquations.easeOutQuad(t, 0, maxOpacity, d / 2); Tweener.addTween(arrors[i], {
else opacity: 0,
return TweenerEquations.easeInQuad(t - d / 2, maxOpacity, -maxOpacity, d / 2); time: ARROW_ANIMATION_TIME / (2 * 1000),
transition: 'easeInQuad'
});
} }
}); });
} }