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

Fix closing of loop variable which caused error messages

Browse Source 
Can't close over loop variables in that way; need to define an explicit var.

Also fix case where no title is defined yet when attempting to adjust.

svn path=/trunk/; revision=154
This commit is contained in:
Colin Walters 2009-01-20 16:13:41 +00:00
parent 70a3434b5a
commit 12b10342e0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/ui/workspaces.js
View File

@ -262,7 +262,8 @@ Workspace.prototype = {
let newY = this.gridY + (this._windows[i].y - this._desktop.y) * rescale; let newY = this.gridY + (this._windows[i].y - this._desktop.y) * rescale;
let newWindowScale = this._windows[i].scale_x * rescale; let newWindowScale = this._windows[i].scale_x * rescale;
Tweener.addTween(this._windows[i], let window = this._windows[i];
Tweener.addTween(window,
{ x: newX, { x: newX,
y: newY, y: newY,
scale_x: newWindowScale, scale_x: newWindowScale,
@ -270,7 +271,7 @@ Workspace.prototype = {
time: Overlay.ANIMATION_TIME, time: Overlay.ANIMATION_TIME,
transition: "easeOutQuad", transition: "easeOutQuad",
onComplete: function () { onComplete: function () {
me._adjustCloneTitle(me._windows[i]); me._adjustCloneTitle(window);
} }
}); });
@ -492,6 +493,8 @@ Workspace.prototype = {
_adjustCloneTitle : function (clone) { _adjustCloneTitle : function (clone) {
let transformed = clone.get_transformed_size(); let transformed = clone.get_transformed_size();
let title = clone.cloneTitle; let title = clone.cloneTitle;
if (!title)
return;
title.width = Math.min(title.fullWidth, transformed[0]); title.width = Math.min(title.fullWidth, transformed[0]);
let xoff = (transformed[0] - title.width)/2; let xoff = (transformed[0] - title.width)/2;
title.set_position(clone.x+xoff, clone.y); title.set_position(clone.x+xoff, clone.y);