[gnome-shell/gnome-3-34] windowManager: Complete interrupted size change effects
- From: Florian MĂźllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/gnome-3-34] windowManager: Complete interrupted size change effects
- Date: Fri, 8 Nov 2019 22:20:50 +0000 (UTC)
commit a43c22e3af01782cdb960c05f48d4bb8c2d63e3f
Author: Florian MĂźllner <fmuellner gnome org>
Date: Fri Nov 8 18:22:40 2019 +0100
windowManager: Complete interrupted size change effects
Resizing effects are more finicky as other effects, as the actual
animation is delayed until we receive the ::size-changed signal.
However that signal may never be emitted if the window is destroyed
just after starting the size-change effect, in which case the effect
is never completed, blocking mutter from destroying the corresponding
window actor.
Address this by tracking when a resize effect is pending, and complete
the effect when appropriate.
https://gitlab.gnome.org/GNOME/mutter/issues/655
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/815
js/ui/windowManager.js | 6 ++++++
1 file changed, 6 insertions(+)
---
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index c1bc415454..3d8c465725 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -704,6 +704,7 @@ var WindowManager = class {
this._unminimizing = new Set();
this._mapping = new Set();
this._resizing = new Set();
+ this._resizePending = new Set();
this._destroying = new Set();
this._movingWindow = null;
@@ -1492,6 +1493,7 @@ var WindowManager = class {
this._clearAnimationInfo(actor);
});
+ this._resizePending.add(actor);
actor.__animationInfo = { clone: actorClone,
oldRect: oldFrameRect,
destroyId: destroyId };
@@ -1510,6 +1512,7 @@ var WindowManager = class {
let scaleX = targetRect.width / sourceRect.width;
let scaleY = targetRect.height / sourceRect.height;
+ this._resizePending.delete(actor);
this._resizing.add(actor);
// Now scale and fade out the clone
@@ -1571,6 +1574,9 @@ var WindowManager = class {
actor.translation_y = 0;
this._clearAnimationInfo(actor);
}
+
+ if (this._resizePending.delete(actor))
+ this._shellwm.completed_size_change(actor);
}
_sizeChangeWindowOverwritten(shellwm, actor) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]