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

Reposition items at start of fade in

Browse Source 
We need to set the positions after the animation ends (and
fadeIn starts), not before when allocation is changed.

As the window may still be in motion when the overlay is
repositioned, it is safer to pass the calculated values
as parameters.

https://bugzilla.gnome.org/show_bug.cgi?id=602598
This commit is contained in:
Florian Müllner 2009-11-22 04:51:28 +01:00 committed by Colin Walters
parent 2cb4dfb4a4
commit d1edefdc39
1 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
js/ui/workspaces.js
View File

@ -337,8 +337,6 @@ WindowOverlay.prototype = {
button._overlap = 0; button._overlap = 0;
windowClone.actor.connect('destroy', Lang.bind(this, this._onDestroy)); windowClone.actor.connect('destroy', Lang.bind(this, this._onDestroy));
windowClone.actor.connect('notify::allocation',
Lang.bind(this, this._positionItems));
windowClone.actor.connect('enter-event', windowClone.actor.connect('enter-event',
Lang.bind(this, this._onEnter)); Lang.bind(this, this._onEnter));
windowClone.actor.connect('leave-event', windowClone.actor.connect('leave-event',
@ -395,23 +393,30 @@ WindowOverlay.prototype = {
this.title.height + this.title._spacing; this.title.height + this.title._spacing;
}, },
_positionItems: function(win) { /**
* @cloneX: x position of windowClone
* @cloneY: y position of windowClone
* @cloneWidth: width of windowClone
* @cloneHeight height of windowClone
*/
// These parameters are not the values retrieved with
// get_transformed_position() and get_transformed_size(),
// as windowClone might be moving.
// See Workspace._fadeInWindowOverlay
updatePositions: function(cloneX, cloneY, cloneWidth, cloneHeight) {
let button = this.closeButton; let button = this.closeButton;
let title = this.title; let title = this.title;
let [x, y] = win.get_transformed_position(); let buttonX = cloneX + cloneWidth - button._overlap;
let [w, h] = win.get_transformed_size(); let buttonY = cloneY - button.height + button._overlap;
let buttonX = x + w - button._overlap;
let buttonY = y - button.height + button._overlap;
button.set_position(Math.floor(buttonX), Math.floor(buttonY)); button.set_position(Math.floor(buttonX), Math.floor(buttonY));
if (!title.fullWidth) if (!title.fullWidth)
title.fullWidth = title.width; title.fullWidth = title.width;
title.width = Math.min(title.fullWidth, w); title.width = Math.min(title.fullWidth, cloneWidth);
let titleX = x + (w - title.width) / 2; let titleX = cloneX + (cloneWidth - title.width) / 2;
let titleY = y + h + title._spacing; let titleY = cloneY + cloneHeight + title._spacing;
title.set_position(Math.floor(titleX), Math.floor(titleY)); title.set_position(Math.floor(titleX), Math.floor(titleY));
}, },
@ -1034,7 +1039,7 @@ Workspace.prototype = {
time: Overview.ANIMATION_TIME, time: Overview.ANIMATION_TIME,
transition: "easeOutQuad", transition: "easeOutQuad",
onComplete: Lang.bind(this, function() { onComplete: Lang.bind(this, function() {
overlay.fadeIn(); this._fadeInWindowOverlay(clone, overlay);
}) })
}); });
} }
@ -1058,13 +1063,31 @@ Workspace.prototype = {
} }
}, },
_fadeInWindowOverlay: function(clone, overlay) {
// This is a little messy and complicated because when we
// start the fade-in we may not have done the final positioning
// of the workspaces. (Tweener doesn't necessarily finish
// all animations before calling onComplete callbacks.)
// So we need to manually compute where the window will
// be after the workspace animation finishes.
let [cloneX, cloneY] = clone.actor.get_position();
let [cloneWidth, cloneHeight] = clone.actor.get_size();
cloneX = this.gridX + this.scale * cloneX;
cloneY = this.gridY + this.scale * cloneY;
cloneWidth = this.scale * clone.actor.scale_x * cloneWidth;
cloneHeight = this.scale * clone.actor.scale_y * cloneHeight;
overlay.updatePositions(cloneX, cloneY, cloneWidth, cloneHeight);
overlay.fadeIn();
},
_fadeInAllOverlays: function() { _fadeInAllOverlays: function() {
for (let i = 1; i < this._windows.length; i++) { for (let i = 1; i < this._windows.length; i++) {
let clone = this._windows[i]; let clone = this._windows[i];
let overlay = this._windowOverlays[i]; let overlay = this._windowOverlays[i];
if (this._showOnlyWindows != null && !(clone.metaWindow in this._showOnlyWindows)) if (this._showOnlyWindows != null && !(clone.metaWindow in this._showOnlyWindows))
continue; continue;
overlay.fadeIn(); this._fadeInWindowOverlay(clone, overlay);
} }
}, },