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

Use a stable workspace ordering as rows and columns are added, rather than

Browse Source 
just doing a simple row-major ordering

svn path=/trunk/; revision=126
This commit is contained in:
Dan Winship 2008-12-15 20:58:10 +00:00
parent d07433d445
commit 97ae22dae5
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
js/ui/workspaces.js
View File

@ -171,6 +171,16 @@ Workspaces.prototype = {
this._backdrop = null; this._backdrop = null;
}, },
// Assign grid positions to workspaces. We can't just do a simple
// row-major or column-major numbering, because we don't want the
// existing workspaces to get rearranged when we add a row or
// column. So we alternate between adding to rows and adding to
// columns. (So, eg, when going from a 2x2 grid of 4 workspaces to
// a 3x2 grid of 5 workspaces, the 4 existing workspaces stay
// where they are, and the 5th one is added to the end of the
// first row.)
//
// FIXME: need to make the metacity internal layout agree with this!
_positionWorkspaces : function(global, activeWorkspace) { _positionWorkspaces : function(global, activeWorkspace) {
let gridWidth = Math.ceil(Math.sqrt(this._workspaces.length)); let gridWidth = Math.ceil(Math.sqrt(this._workspaces.length));
let gridHeight = Math.ceil(this._workspaces.length / gridWidth); let gridHeight = Math.ceil(this._workspaces.length / gridWidth);
@ -179,8 +189,9 @@ Workspaces.prototype = {
let wsHeight = (this._height - (gridHeight - 1) * GRID_SPACING) / gridHeight; let wsHeight = (this._height - (gridHeight - 1) * GRID_SPACING) / gridHeight;
let scale = wsWidth / global.screen_width; let scale = wsWidth / global.screen_width;
// Assign workspaces to grid positions let span = 1, n = 0, row = 0, col = 0, horiz = true;
for (let w = 0, col = 0, row = 0; w < this._workspaces.length; w++) {
for (let w = 0; w < this._workspaces.length; w++) {
let workspace = this._workspaces[w]; let workspace = this._workspaces[w];
workspace.gridRow = row; workspace.gridRow = row;
@ -190,10 +201,19 @@ Workspaces.prototype = {
workspace.gridY = this._y + workspace.gridRow * (wsHeight + GRID_SPACING); workspace.gridY = this._y + workspace.gridRow * (wsHeight + GRID_SPACING);
workspace.gridScale = scale; workspace.gridScale = scale;
if (horiz) {
col++; col++;
if (col == gridWidth) { if (col == span) {
col = 0; row = 0;
horiz = false;
}
} else {
row++; row++;
if (row == span) {
col = 0;
horiz = true;
span++;
}
} }
} }