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

workspacesView: Don't conform to aspect ratio

Browse Source 
We want the window picker to use the full height of the area it's given.

https://bugzilla.gnome.org/show_bug.cgi?id=582650
This commit is contained in:
Jasper St. Pierre 2012-08-09 12:38:36 -03:00
parent 667019a8c1
commit d7929a2340
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/ui/workspacesView.js
View File

@ -51,7 +51,6 @@ const WorkspacesView = new Lang.Class({
this._clipY = 0; this._clipY = 0;
this._clipWidth = 0; this._clipWidth = 0;
this._clipHeight = 0; this._clipHeight = 0;
this._workspaceRatioSpacing = 0;
this._spacing = 0; this._spacing = 0;
this._animating = false; // tweening this._animating = false; // tweening
this._scrolling = false; // swipe-scrolling this._scrolling = false; // swipe-scrolling
@ -142,15 +141,15 @@ const WorkspacesView = new Lang.Class({
this._extraWorkspaces = []; this._extraWorkspaces = [];
}, },
setGeometry: function(x, y, width, height, spacing) { setGeometry: function(x, y, width, height) {
if (this._x == x && this._y == y && if (this._x == x && this._y == y &&
this._width == width && this._height == height) this._width == width && this._height == height)
return; return;
this._width = width; this._width = width;
this._height = height; this._height = height;
this._x = x; this._x = x;
this._y = y; this._y = y;
this._workspaceRatioSpacing = spacing;
for (let i = 0; i < this._workspaces.length; i++) for (let i = 0; i < this._workspaces.length; i++)
this._workspaces[i].setGeometry(x, y, width, height); this._workspaces[i].setGeometry(x, y, width, height);
@ -225,7 +224,7 @@ const WorkspacesView = new Lang.Class({
Tweener.removeTweens(workspace.actor); Tweener.removeTweens(workspace.actor);
let y = (w - active) * (this._height + this._spacing + this._workspaceRatioSpacing); let y = (w - active) * (this._height + this._spacing);
if (showAnimation) { if (showAnimation) {
let params = { y: y, let params = { y: y,
@ -860,7 +859,7 @@ const WorkspacesDisplay = new Lang.Class({
let rtl = (Clutter.get_default_text_direction () == Clutter.TextDirection.RTL); let rtl = (Clutter.get_default_text_direction () == Clutter.TextDirection.RTL);
let clipWidth = width - controlsVisible; let clipWidth = width - controlsVisible;
let clipHeight = (fullHeight / fullWidth) * clipWidth; let clipHeight = fullHeight;
let clipX = rtl ? x + controlsVisible : x; let clipX = rtl ? x + controlsVisible : x;
let clipY = y + (fullHeight - clipHeight) / 2; let clipY = y + (fullHeight - clipHeight) / 2;
@ -869,19 +868,13 @@ const WorkspacesDisplay = new Lang.Class({
if (rtl) if (rtl)
x += widthAdjust; x += widthAdjust;
height = (fullHeight / fullWidth) * width;
let difference = fullHeight - height;
y += difference / 2;
let monitors = Main.layoutManager.monitors; let monitors = Main.layoutManager.monitors;
let m = 0; let m = 0;
for (let i = 0; i < monitors.length; i++) { for (let i = 0; i < monitors.length; i++) {
if (i == this._primaryIndex) { if (i == this._primaryIndex) {
this._workspacesViews[m].setClipRect(clipX, clipY, this._workspacesViews[m].setClipRect(clipX, clipY,
clipWidth, clipHeight); clipWidth, clipHeight);
this._workspacesViews[m].setGeometry(x, y, width, height, this._workspacesViews[m].setGeometry(x, y, width, height);
difference);
m++; m++;
} else if (!this._workspacesOnlyOnPrimary) { } else if (!this._workspacesOnlyOnPrimary) {
this._workspacesViews[m].setClipRect(monitors[i].x, this._workspacesViews[m].setClipRect(monitors[i].x,
@ -891,7 +884,7 @@ const WorkspacesDisplay = new Lang.Class({
this._workspacesViews[m].setGeometry(monitors[i].x, this._workspacesViews[m].setGeometry(monitors[i].x,
monitors[i].y, monitors[i].y,
monitors[i].width, monitors[i].width,
monitors[i].height, 0); monitors[i].height);
m++; m++;
} }
} }