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

Consider height when positioning windows in the overlay

Browse Source 
I've done some little modifications to the window positioning code
used in the overlay so that it considers the height of the windows
and they don't overlap or get out of the workspace.

I've also raised the hard-coded scales a bit to have the windows as
big as possible without overlapping (this could use some testing on
a non-widescreen monitor).
This commit is contained in:
Siegfried-Angel Gevatter Pujals 2009-08-08 22:10:40 +02:00
parent ebd6f4bc8f
commit 5a75b44f71
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/ui/workspaces.js
View File

@ -35,11 +35,11 @@ FRAME_COLOR.from_pixel(0xffffffff);
// Each triplet is [xCenter, yCenter, scale] where the scale // Each triplet is [xCenter, yCenter, scale] where the scale
// is relative to the width of the workspace. // is relative to the width of the workspace.
const POSITIONS = { const POSITIONS = {
1: [[0.5, 0.5, 0.8]], 1: [[0.5, 0.5, 0.95]],
2: [[0.25, 0.5, 0.45], [0.75, 0.5, 0.45]], 2: [[0.25, 0.5, 0.48], [0.75, 0.5, 0.48]],
3: [[0.25, 0.25, 0.45], [0.75, 0.25, 0.45], [0.5, 0.75, 0.45]], 3: [[0.25, 0.25, 0.48], [0.75, 0.25, 0.48], [0.5, 0.75, 0.48]],
4: [[0.25, 0.25, 0.45], [0.75, 0.25, 0.45], [0.75, 0.75, 0.45], [0.25, 0.75, 0.45]], 4: [[0.25, 0.25, 0.47], [0.75, 0.25, 0.47], [0.75, 0.75, 0.47], [0.25, 0.75, 0.47]],
5: [[0.165, 0.25, 0.30], [0.495, 0.25, 0.30], [0.825, 0.25, 0.30], [0.25, 0.75, 0.30], [0.75, 0.75, 0.30]] 5: [[0.165, 0.25, 0.32], [0.495, 0.25, 0.32], [0.825, 0.25, 0.32], [0.25, 0.75, 0.32], [0.75, 0.75, 0.32]]
}; };
// Spacing between workspaces. At the moment, the same spacing is used // Spacing between workspaces. At the moment, the same spacing is used
@ -448,9 +448,9 @@ Workspace.prototype = {
xCenter = xCenter * global.screen_width; xCenter = xCenter * global.screen_width;
yCenter = yCenter * global.screen_height; yCenter = yCenter * global.screen_height;
let size = Math.max(clone.actor.width, clone.actor.height); let desiredWidth = global.screen_width * fraction;
let desiredSize = global.screen_width * fraction; let desiredHeight = global.screen_height * fraction;
let scale = Math.min(desiredSize / size, 1.0 / this.scale); let scale = Math.min(desiredWidth / clone.actor.width, desiredHeight / clone.actor.height, 1.0 / this.scale);
icon.hide(); icon.hide();
Tweener.addTween(clone.actor, Tweener.addTween(clone.actor,
@ -791,7 +791,7 @@ Workspace.prototype = {
let gridWidth = Math.ceil(Math.sqrt(numberOfWindows)); let gridWidth = Math.ceil(Math.sqrt(numberOfWindows));
let gridHeight = Math.ceil(numberOfWindows / gridWidth); let gridHeight = Math.ceil(numberOfWindows / gridWidth);
let fraction = Math.sqrt(.5/(gridWidth * gridHeight)); let fraction = 0.95 * (1. / gridWidth);
let xCenter = (.5 / gridWidth) + ((windowIndex) % gridWidth) / gridWidth; let xCenter = (.5 / gridWidth) + ((windowIndex) % gridWidth) / gridWidth;
let yCenter = (.5 / gridHeight) + Math.floor((windowIndex / gridWidth)) / gridHeight; let yCenter = (.5 / gridHeight) + Math.floor((windowIndex / gridWidth)) / gridHeight;