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

Revert "appDisplay/baseAppView: Cleanup animate()"

Browse Source 
This reverts commit cd8269185. It turns out this seemingly
harmless cleanup introduced a regression:

 * Open overview
 * Press Meta+A twice
 * Close overview
 * Press Meta+A
 * Enjoy an invisible grid

Fixes https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3451

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1532>
This commit is contained in:
Georges Basile Stavracas Neto 2020-12-11 12:55:23 -03:00
parent ad9c2dd817
commit 99b78d3ee8
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/ui/appDisplay.js
View File

@ -696,6 +696,7 @@ var BaseAppView = GObject.registerClass({
}
_doSpringAnimation(animationDirection) {
this._grid.opacity = 255;
this._grid.animateSpring(
animationDirection,
Main.overview.dash.showAppsButton);
@ -713,16 +714,15 @@ var BaseAppView = GObject.registerClass({
}
animate(animationDirection, onComplete) {
const animationDoneId = this._grid.connect('animation-done', () => {
if (onComplete) {
let animationDoneId = this._grid.connect('animation-done', () => {
this._grid.disconnect(animationDoneId);
this._grid.opacity =
animationDirection === IconGrid.AnimationDirection.IN
? 255 : 0;
if (onComplete)
onComplete();
});
}
this._clearAnimateLater();
this._grid.opacity = 255;
if (animationDirection == IconGrid.AnimationDirection.IN) {
const doSpringAnimationLater = laterType => {
@ -734,18 +734,18 @@ var BaseAppView = GObject.registerClass({
});
};
this._grid.opacity = 0;
if (this._viewIsReady) {
this._grid.opacity = 0;
doSpringAnimationLater(Meta.LaterType.IDLE);
} else {
this._viewLoadedHandlerId = this.connect('view-loaded',
() => {
this._clearAnimateLater();
this._grid.opacity = 255;
doSpringAnimationLater(Meta.LaterType.BEFORE_REDRAW);
});
}
} else {
this._grid.opacity = 255;
this._doSpringAnimation(animationDirection);
}
}