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

boxpointer: keep a margin between the box and the screen edge

Browse Source 
per the mockups

https://bugzilla.gnome.org/show_bug.cgi?id=631193
This commit is contained in:
Dan Winship 2010-10-25 11:50:00 -04:00
parent 9d94da83d7
commit 2b3c31a503
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/ui/boxpointer.js
View File

@ -258,8 +258,6 @@ BoxPointer.prototype = {
},
setPosition: function(sourceActor, gap, alignment) {
let primary = global.get_primary_monitor();
// We need to show it now to force an allocation,
// so that we can query the correct size.
this.actor.show();
@ -270,6 +268,12 @@ BoxPointer.prototype = {
let [minWidth, minHeight, natWidth, natHeight] = this.actor.get_preferred_size();
// We also want to keep it onscreen, and separated from the
// edge by the same distance as the main part of the box is
// separated from its sourceActor
let primary = global.get_primary_monitor();
let arrowRise = this.actor.get_theme_node().get_length('-arrow-rise');
let resX, resY;
switch (this._arrowSide) {
@ -304,7 +308,7 @@ BoxPointer.prototype = {
break;
}
resX = Math.min(resX, primary.x + primary.width - natWidth);
resX = Math.min(resX, primary.x + primary.width - natWidth - arrowRise - gap);
resX = Math.max(resX, primary.x);
this.setArrowOrigin((sourceX - resX) + Math.floor(sourceWidth / 2));
@ -324,7 +328,7 @@ BoxPointer.prototype = {
break;
}
resY = Math.min(resY, primary.y + primary.height - natHeight);
resY = Math.min(resY, primary.y + primary.height - natHeight - arrowRise - gap);
resY = Math.max(resY, primary.y);
this.setArrowOrigin((sourceY - resY) + Math.floor(sourceHeight / 2));