From 16fa186b633d223ed117554e87231a30236b9e87 Mon Sep 17 00:00:00 2001 From: Adel Gadllah Date: Mon, 24 Jun 2013 22:53:56 +0200 Subject: [PATCH] overview: Fix zoom animation When the allocation of the workspacesView changes during the animation we override the tween with one that does not animate causing the overview zoom animation not to happen. Fix that by ignoring the alloactionChanged notification during the overview animation. --- js/ui/workspacesView.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js index 50f079c3e..3eb9c0dcb 100644 --- a/js/ui/workspacesView.js +++ b/js/ui/workspacesView.js @@ -446,7 +446,7 @@ const WorkspacesDisplay = new Lang.Class({ _init: function() { this.actor = new St.Widget({ clip_to_allocation: true }); - this.actor.connect('notify::allocation', Lang.bind(this, this._updateWorkspacesActualGeometry)); + this.actor.connect('notify::allocation', Lang.bind(this, this._allocationChanged)); this.actor.connect('parent-set', Lang.bind(this, this._parentSet)); let clickAction = new Clutter.ClickAction() @@ -676,6 +676,12 @@ const WorkspacesDisplay = new Lang.Class({ } }, + _allocationChanged: function() { + if (Main.overview.animationInProgress) + return; + this._updateWorkspacesActualGeometry(); + }, + _updateWorkspacesActualGeometry: function() { if (!this._workspacesViews.length) return;