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

boxpointer: fix multi monitor support

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=641195
This commit is contained in:
Maxim Ermilov 2011-02-02 02:37:43 +03:00
parent 0310f07eab
commit 5b95ccae5f
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/ui/boxpointer.js
View File

@ -414,16 +414,15 @@ BoxPointer.prototype = {
if (sourceCenterX < margin) { if (sourceCenterX < margin) {
// Not enough space to the top // Not enough space to the top
this._arrowCorner = (this._arrowSide == St.Side.TOP) ? St.Corner.TOPLEFT : St.Corner.BOTTOMLEFT; this._arrowCorner = (this._arrowSide == St.Side.TOP) ? St.Corner.TOPLEFT : St.Corner.BOTTOMLEFT;
resX = 10; resX = primary.x + 10;
} else if (sourceCenterX > (primary.width - margin)) { } else if (sourceCenterX > (primary.x + primary.width - margin)) {
// Not enough space to the botom // Not enough space to the botom
this._arrowCorner = (this._arrowSide == St.Side.TOP) ? St.Corner.TOPRIGHT : St.Corner.BOTTOMRIGHT; this._arrowCorner = (this._arrowSide == St.Side.TOP) ? St.Corner.TOPRIGHT : St.Corner.BOTTOMRIGHT;
resX = primary.width - (10 + natWidth); resX = primary.x + primary.width - (10 + natWidth);
} }
resX = Math.max(resX, 10); resX = Math.max(resX, primary.x + 10);
resX = Math.min(resX, primary.width - (10 + natWidth)); resX = Math.min(resX, primary.x + primary.width - (10 + natWidth));
this.setArrowOrigin(sourceCenterX - resX); this.setArrowOrigin(sourceCenterX - resX);
break; break;
@ -445,14 +444,14 @@ BoxPointer.prototype = {
this._arrowCorner = (this._arrowSide == St.Side.LEFT) ? St.Corner.TOPLEFT : St.Corner.TORIGHT; this._arrowCorner = (this._arrowSide == St.Side.LEFT) ? St.Corner.TOPLEFT : St.Corner.TORIGHT;
resY = 10; resY = 10;
} }
else if (sourceCenterY > (primary.height - margin)) { else if (sourceCenterY > (primary.y + primary.height - margin)) {
// Not enough space to the right // Not enough space to the right
this._arrowCorner = (this._arrowSide == St.Side.LEFT) ? St.Corner.BOTTOMLEFT : St.Corner.BOTTOMRIGHT; this._arrowCorner = (this._arrowSide == St.Side.LEFT) ? St.Corner.BOTTOMLEFT : St.Corner.BOTTOMRIGHT;
resY = primary.height - (10 + natHeight); resY = primary.y + primary.height - (10 + natHeight);
} }
resY = Math.max(resY, 10); resY = Math.max(resY, primary.y + 10);
resY = Math.min(resY, primary.height - (10 + natHeight)); resY = Math.min(resY, primary.y + primary.height - (10 + natHeight));
this.setArrowOrigin(sourceCenterY - resY); this.setArrowOrigin(sourceCenterY - resY);
break; break;