[gnome-shell/gbsneto/icon-grid-dnd-fixes: 13/16] appDisplay: Don't change opacity on destruction
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/gbsneto/icon-grid-dnd-fixes: 13/16] appDisplay: Don't change opacity on destruction
- Date: Mon, 5 Oct 2020 12:06:49 +0000 (UTC)
commit 33bd038af256551430b21f9fe96711515d745fb4
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Thu Sep 24 15:57:12 2020 -0300
appDisplay: Don't change opacity on destruction
At the end of BaseAppView._clearAnimateLater(), the '_grid' actor's opacity is
set to 255. As it turns out, _clearAnimateLater() is called, among others, by
vfunc_unmap(). However, unmapping is part of the destruction process, and at
the time it is called, '_grid' is already destroying, which makes GJS complain
about accessing an invalid object.
Don't change opacity on BaseAppView._clearAnimateLater(), and instead move it
to the couple of places outside vfunc_unmap() that call it.
https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1447
js/ui/appDisplay.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 840d4fd3e0..fa2782d81e 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -654,7 +654,6 @@ var BaseAppView = GObject.registerClass({
this.disconnect(this._viewLoadedHandlerId);
this._viewLoadedHandlerId = 0;
}
- this._grid.opacity = 255;
}
animate(animationDirection, onComplete) {
@@ -666,6 +665,7 @@ var BaseAppView = GObject.registerClass({
}
this._clearAnimateLater();
+ this._grid.opacity = 255;
if (animationDirection == IconGrid.AnimationDirection.IN) {
const doSpringAnimationLater = laterType => {
@@ -684,6 +684,7 @@ var BaseAppView = GObject.registerClass({
this._viewLoadedHandlerId = this.connect('view-loaded',
() => {
this._clearAnimateLater();
+ this._grid.opacity = 255;
doSpringAnimationLater(Meta.LaterType.BEFORE_REDRAW);
});
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]