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

workspace: Clamp individual maximized scales to WINDOW_CLONE_MAXIMUM_SCALE

Browse Source 
We clamp the overall layout's scale to WINDOW_CLONE_MAXIMUM_SCALE, but since
we do a bit of tweaking to try and make super small windows a tad larger, it's
theoretically possible that windows may become larger than the proper maximum
scale. Fix this issue.

https://bugzilla.gnome.org/show_bug.cgi?id=686944
This commit is contained in:
Jasper St. Pierre 2012-10-27 22:46:27 -04:00
parent 07696086a2
commit 7ba0f07732
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
js/ui/workspace.js
View File

@ -774,13 +774,9 @@ const LayoutStrategy = new Lang.Class({
windows: [] }; windows: [] };
}, },
// Compute the size and fancy scale for @window using the // Computes and returns a fancy scale for @window using the
// base scale, @scale. // base scale, @scale.
// _computeWindowScale: function(window, scale) {
// Returns a list structure: [ scaledWidth, scaledHeight, fancyScale ]
// where scaledWidth and scaledHeight are the window's
// width and height, scaled by fancyScale for convenience.
_computeWindowSizeAndScale: function(window, scale) {
let width = window.actor.width; let width = window.actor.width;
let height = window.actor.height; let height = window.actor.height;
let ratio; let ratio;
@ -791,7 +787,7 @@ const LayoutStrategy = new Lang.Class({
ratio = height / this._monitor.height; ratio = height / this._monitor.height;
let fancyScale = (2 / (1 + ratio)) * scale; let fancyScale = (2 / (1 + ratio)) * scale;
return [width * fancyScale, height * fancyScale, fancyScale]; return fancyScale;
}, },
// Compute the size of each row, by assigning to the properties // Compute the size of each row, by assigning to the properties
@ -873,7 +869,10 @@ const LayoutStrategy = new Lang.Class({
for (let j = 0; j < row.windows.length; j++) { for (let j = 0; j < row.windows.length; j++) {
let window = row.windows[j]; let window = row.windows[j];
let [width, height, s] = this._computeWindowSizeAndScale(window, scale); let s = this._computeWindowScale(window, scale);
s = Math.min(s, WINDOW_CLONE_MAXIMUM_SCALE);
let width = window.actor.width * s;
let height = window.actor.height * s;
let y = row.y + row.height - height; let y = row.y + row.height - height;
let x = baseX; let x = baseX;
@ -934,7 +933,9 @@ const UnalignedLayoutStrategy = new Lang.Class({
for (; windowIdx < windows.length; windowIdx++) { for (; windowIdx < windows.length; windowIdx++) {
let window = windows[windowIdx]; let window = windows[windowIdx];
let [width, height] = this._computeWindowSizeAndScale(window, 1); let s = this._computeWindowScale(window, 1);
let width = window.actor.width * s;
let height = window.actor.height * s;
row.fullHeight = Math.max(row.fullHeight, height); row.fullHeight = Math.max(row.fullHeight, height);
// either new width is < idealWidth or new width is nearer from idealWidth then oldWidth // either new width is < idealWidth or new width is nearer from idealWidth then oldWidth
@ -1000,9 +1001,9 @@ const GridLayoutStrategy = new Lang.Class({
let window = windows[windowIdx]; let window = windows[windowIdx];
row.windows.push(window); row.windows.push(window);
let [width, height] = this._computeWindowSizeAndScale(window, 1); let s = this._computeWindowScale(window, 1);
maxWindowWidth = Math.max(maxWindowWidth, width); maxWindowWidth = Math.max(maxWindowWidth, window.actor.width * s);
maxWindowHeight = Math.max(maxWindowHeight, height); maxWindowHeight = Math.max(maxWindowHeight, window.actor.height * s);
} }
} }