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

[MessageTray] Fix positioning for multi-monitor environments

Browse Source 
We can't assume that the primary monitor is at position (0, 0);
there may be another monitor configured at the left or at the top.
This commit is contained in:
Siegfried-Angel Gevatter Pujals 2010-02-02 14:02:32 +01:00
parent 3e19f41cba
commit eaa1f9a0f4
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/ui/messageTray.js
View File

@ -126,7 +126,7 @@ MessageTray.prototype = {
this._summaryBin.connect('notify::allocation', Lang.bind(this, this._summaryBin.connect('notify::allocation', Lang.bind(this,
function() { function() {
let primary = global.get_primary_monitor(); let primary = global.get_primary_monitor();
this._summaryBin.x = primary.width - this._summaryBin.width; this._summaryBin.x = primary.x + primary.width - this._summaryBin.width;
})); }));
Main.chrome.addActor(this.actor, { affectsStruts: false }); Main.chrome.addActor(this.actor, { affectsStruts: false });
@ -147,8 +147,8 @@ MessageTray.prototype = {
_setSizePosition: function() { _setSizePosition: function() {
let primary = global.get_primary_monitor(); let primary = global.get_primary_monitor();
this.actor.x = 0; this.actor.x = primary.x;
this.actor.y = primary.height - 1; this.actor.y = primary.y + primary.height - 1;
this.actor.width = primary.width; this.actor.width = primary.width;
}, },
@ -311,7 +311,7 @@ MessageTray.prototype = {
_showTray: function() { _showTray: function() {
let primary = global.get_primary_monitor(); let primary = global.get_primary_monitor();
Tweener.addTween(this.actor, Tweener.addTween(this.actor,
{ y: primary.height - this.actor.height, { y: primary.y + primary.height - this.actor.height,
time: ANIMATION_TIME, time: ANIMATION_TIME,
transition: "easeOutQuad" transition: "easeOutQuad"
}); });
@ -321,7 +321,7 @@ MessageTray.prototype = {
let primary = global.get_primary_monitor(); let primary = global.get_primary_monitor();
Tweener.addTween(this.actor, Tweener.addTween(this.actor,
{ y: primary.height - 1, { y: primary.y + primary.height - 1,
time: ANIMATION_TIME, time: ANIMATION_TIME,
transition: "easeOutQuad" transition: "easeOutQuad"
}); });
@ -332,13 +332,14 @@ MessageTray.prototype = {
this._notificationBox.setContent(this._notificationQueue.shift()); this._notificationBox.setContent(this._notificationQueue.shift());
let notification = this._notificationBox.actor; let notification = this._notificationBox.actor;
notification.opacity = 0; let primary = global.get_primary_monitor();
notification.y = this.actor.height; notification.opacity = 0;
notification.y = primary.y + this.actor.height;
notification.show(); notification.show();
let futureY = this.actor.height - notification.height; let futureY = primary.y + this.actor.height - notification.height;
Tweener.addTween(notification, Tweener.addTween(notification,
{ y: this.actor.height - notification.height, { y: futureY,
opacity: 255, opacity: 255,
time: ANIMATION_TIME, time: ANIMATION_TIME,
transition: "easeOutQuad" }); transition: "easeOutQuad" });
@ -358,11 +359,12 @@ MessageTray.prototype = {
}, },
_showSummary: function() { _showSummary: function() {
let primary = global.get_primary_monitor();
this._summaryBin.opacity = 0; this._summaryBin.opacity = 0;
this._summaryBin.y = this.actor.height; this._summaryBin.y = this.actor.height;
this._summaryBin.show(); this._summaryBin.show();
Tweener.addTween(this._summaryBin, Tweener.addTween(this._summaryBin,
{ y: this.actor.height - this._summaryBin.height, { y: primary.y + this.actor.height - this._summaryBin.height,
opacity: 255, opacity: 255,
time: ANIMATION_TIME, time: ANIMATION_TIME,
transition: "easeOutQuad" }); transition: "easeOutQuad" });